updated for version 7.2-248

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index eaf73098370458d708c67841034b444ff8d829c0..0a869dc122b897f45628e3f9f024207d5318bae4 100644 (file)
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -212,13 +212,34 @@ ifndef MZSCHEME_VER
 MZSCHEME_VER = 209_000
 endif
 
+ifndef MZSCHEME_PRECISE_GC
+MZSCHEME_PRECISE_GC=no
+endif
+
+# for version 4.x we need to generate byte-code for Scheme base
+ifndef MZSCHEME_GENERATE_BASE
+MZSCHEME_GENERATE_BASE=no
+endif
+
 ifeq (yes, $(DYNAMIC_MZSCHEME))
 DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 else
 ifndef MZSCHEME_DLLS
 MZSCHEME_DLLS = $(MZSCHEME)
 endif
-EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+ifeq (yes,$(MZSCHEME_PRECISE_GC))
+MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+else
+MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+endif
+EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
+endif
+ifeq (yes,$(MZSCHEME_GENERATE_BASE))
+DEFINES += -DINCLUDE_MZSCHEME_BASE
+MZ_EXTRA_DEP += mzscheme_base.c
+endif
+ifeq (yes,$(MZSCHEME_PRECISE_GC))
+DEFINES += -DMZ_PRECISE_GC
 endif
 endif
 
@@ -472,6 +493,9 @@ clean:
        -$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
 ifdef PERL
        -$(DEL) if_perl.c
+endif
+ifdef MZSCHEME
+       -$(DEL) mzscheme_base.c
 endif
        -$(DEL) pathdef.c
        $(MAKE) -C xxd -f Make_cyg.mak clean
@@ -523,9 +547,15 @@ endif
 $(OUTDIR)/netbeans.o:  netbeans.c $(INCL) $(NBDEBUG_DEP)
        $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
 
+$(OUTDIR)/if_mzsch.o:  if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
+       $(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
+
 $(OUTDIR)/vimrc.o:     vim.rc version.h gui_w32_rc.h
        $(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
 
+mzscheme_base.c:
+       $(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
+
 pathdef.c: $(INCL)
 ifneq (sh.exe, $(SHELL))
        @echo creating pathdef.c

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index e0717b62aeb725a0351ebc19efc4963b867d98a2..ae28a3d47c0e832122915bc2de3e2424fef8bab2 100644 (file)
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -135,7 +135,7 @@ endif
 ifndef MZSCHEME_DLLS
 MZSCHEME_DLLS=$(MZSCHEME)
 endif
-MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
+MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
 endif
 
 endif
@@ -562,6 +562,9 @@ clean:
        -$(DEL) pathdef.c
 ifdef PERL
        -$(DEL) if_perl.c
+endif
+ifdef MZSCHEME
+       -$(DEL) mzscheme_base.c
 endif
        $(MAKE) -C GvimExt -f Make_ming.mak clean
        $(MAKE) -C xxd -f Make_cyg.mak clean

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 72e722b42633add1e8c3038b7afc0b1455a67a86..15a14ade1073fe2919e07e002f1b09d6210514bd 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -865,6 +865,7 @@ clean:
        - if exist dimm_i.c del dimm_i.c
        - if exist dimm.tlb del dimm.tlb
        - if exist dosinst.exe del dosinst.exe
+       - if exist mzscheme_base.c del mzscheme_base.c
        cd xxd
        $(MAKE) /NOLOGO -f Make_mvc.mak clean
        cd ..

diff --git a/src/version.c b/src/version.c
index 767152e50f10721cec8d173506f1063e0bce57f1..5a34c87902cbfa59978917376492204e638ec0bc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    248,
 /**/
     247,
 /**/