comparison src/Make_cyg_ming.mak @ 7609:77a14f3bc18b v7.4.1104

commit https://github.com/vim/vim/commit/4e640bd930d133889dbc9f9a77e29bab902e3b7d Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 16 16:20:38 2016 +0100 patch 7.4.1104 Problem: Various problems building with MzScheme/Racket. Solution: Make it work with new versions of Racket. (Yukihiro Nakadaira, Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Jan 2016 16:30:04 +0100
parents 0acbe61244ac
children a865f9773cb2
comparison
equal deleted inserted replaced
7608:161471eae904 7609:77a14f3bc18b
169 169
170 ifndef MZSCHEME_VER 170 ifndef MZSCHEME_VER
171 MZSCHEME_VER=205_000 171 MZSCHEME_VER=205_000
172 endif 172 endif
173 173
174 ifndef MZSCHEME_PRECISE_GC
175 MZSCHEME_PRECISE_GC=no
176 endif
177
178 # for version 4.x we need to generate byte-code for Scheme base 174 # for version 4.x we need to generate byte-code for Scheme base
179 ifndef MZSCHEME_GENERATE_BASE 175 ifndef MZSCHEME_GENERATE_BASE
180 MZSCHEME_GENERATE_BASE=no 176 MZSCHEME_GENERATE_BASE=no
181 endif 177 endif
182 178
183 ifndef MZSCHEME_USE_RACKET 179 ifneq ($(wildcard $(MZSCHEME)/lib/msvc/libmzsch$(MZSCHEME_VER).lib),)
184 MZSCHEME_MAIN_LIB=mzsch 180 MZSCHEME_MAIN_LIB=mzsch
185 else 181 else
186 MZSCHEME_MAIN_LIB=racket 182 MZSCHEME_MAIN_LIB=racket
183 endif
184
185 ifndef MZSCHEME_PRECISE_GC
186 MZSCHEME_PRECISE_GC=no
187 ifneq ($(wildcard $(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll),)
188 ifeq ($(wildcard $(MZSCHEME)\lib\libmzgc$(MZSCHEME_VER).dll),)
189 MZSCHEME_PRECISE_GC=yes
190 endif
191 else
192 ifneq ($(wildcard $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib),)
193 ifeq ($(wildcard $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib),)
194 MZSCHEME_PRECISE_GC=yes
195 endif
196 endif
197 endif
187 endif 198 endif
188 199
189 ifeq (no,$(DYNAMIC_MZSCHEME)) 200 ifeq (no,$(DYNAMIC_MZSCHEME))
190 ifeq (yes,$(MZSCHEME_PRECISE_GC)) 201 ifeq (yes,$(MZSCHEME_PRECISE_GC))
191 MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) 202 MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
192 else 203 else
193 MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER) 204 MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
194 endif 205 endif
195 # the modern MinGW can dynamically link to dlls directly. 206 # the modern MinGW can dynamically link to dlls directly.
196 # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll 207 # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
197 ifndef MZSCHEME_DLLS 208 ifndef MZSCHEME_DLLS
198 MZSCHEME_DLLS=$(MZSCHEME) 209 MZSCHEME_DLLS=$(MZSCHEME)
427 CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\" 438 CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\"
428 endif 439 endif
429 endif 440 endif
430 441
431 ifdef MZSCHEME 442 ifdef MZSCHEME
432 CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\" 443 ifndef MZSCHEME_COLLECTS
444 MZSCHEME_COLLECTS=$(MZSCHEME)/collects
445 ifeq (yes, $(UNDER_CYGWIN))
446 MZSCHEME_COLLECTS:=$(shell cygpath -m $(MZSCHEME_COLLECTS) | sed -e 's/ /\\ /g')
447 endif
448 endif
449 CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME_COLLECTS)\"
433 ifeq (yes, $(DYNAMIC_MZSCHEME)) 450 ifeq (yes, $(DYNAMIC_MZSCHEME))
451 ifeq (yes, $(MZSCHEME_PRECISE_GC))
452 # Precise GC does not use separate dll
453 CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\"
454 else
434 CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" 455 CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
456 endif
435 endif 457 endif
436 ifeq (yes, "$(MZSCHEME_DEBUG)") 458 ifeq (yes, "$(MZSCHEME_DEBUG)")
437 CFLAGS += -DMZSCHEME_FORCE_GC 459 CFLAGS += -DMZSCHEME_FORCE_GC
438 endif 460 endif
439 endif 461 endif