From 281bdcec60a64ccd0b613ecaf2379e46b21c9912 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 25 Jan 2005 21:53:18 +0000 Subject: updated for version 7.0044 --- src/Make_ming.mak | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'src/Make_ming.mak') diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 2d8bbaf5c3..a27ce52089 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -107,16 +107,26 @@ endif # uncomment 'MZSCHEME' if you want a MzScheme-enabled version #MZSCHEME=d:/plt ifdef MZSCHEME +ifndef DYNAMIC_MZSCHEME +DYNAMIC_MZSCHEME=yes +endif + ifndef MZSCHEME_VER MZSCHEME_VER=205_000 endif -# the modern MinGW can dynamically link to dlls directly -# point MZSCHEME_LIBDIR to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll + +ifeq (no,$(DYNAMIC_MZSCHEME)) +MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER) +# the modern MinGW can dynamically link to dlls directly. +# point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll # c:/windows/system32 isn't a good idea, use some other dir; # to build you can put them in temp dir) -ifndef MZSCHEME_LIBDIR -MZSCHEME_LIBDIR=-L$(MZSCHEME) +ifndef MZSCHEME_DLLS +MZSCHEME_DLLS=$(MZSCHEME) +endif +MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) endif + endif # Python support -- works with the ActiveState python 2.0 release (and others @@ -270,6 +280,9 @@ endif ifdef MZSCHEME CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\" +ifeq (yes, $(DYNAMIC_MZSCHEME)) +CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" +endif endif ifdef RUBY @@ -461,10 +474,6 @@ LIB += -lperl$(PERL_VER) endif endif -ifdef MZSCHEME -MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER) -endif - ifdef TCL LIB += -L$(TCL)/lib ifeq (yes, $(DYNAMIC_TCL)) -- cgit v1.2.3