0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

updated for version 7.2-248

This commit is contained in:
Bram Moolenaar 2009-09-11 10:49:58 +00:00
parent e484c94514
commit 2d6db76d97
4 changed files with 38 additions and 2 deletions

View File

@ -212,13 +212,34 @@ ifndef MZSCHEME_VER
MZSCHEME_VER = 209_000 MZSCHEME_VER = 209_000
endif 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)) ifeq (yes, $(DYNAMIC_MZSCHEME))
DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
else else
ifndef MZSCHEME_DLLS ifndef MZSCHEME_DLLS
MZSCHEME_DLLS = $(MZSCHEME) MZSCHEME_DLLS = $(MZSCHEME)
endif 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
endif endif
@ -472,6 +493,9 @@ clean:
-$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe -$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
ifdef PERL ifdef PERL
-$(DEL) if_perl.c -$(DEL) if_perl.c
endif
ifdef MZSCHEME
-$(DEL) mzscheme_base.c
endif endif
-$(DEL) pathdef.c -$(DEL) pathdef.c
$(MAKE) -C xxd -f Make_cyg.mak clean $(MAKE) -C xxd -f Make_cyg.mak clean
@ -523,9 +547,15 @@ endif
$(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_DEP) $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_DEP)
$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o $(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 $(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h
$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o $(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
mzscheme_base.c:
$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
pathdef.c: $(INCL) pathdef.c: $(INCL)
ifneq (sh.exe, $(SHELL)) ifneq (sh.exe, $(SHELL))
@echo creating pathdef.c @echo creating pathdef.c

View File

@ -135,7 +135,7 @@ endif
ifndef MZSCHEME_DLLS ifndef MZSCHEME_DLLS
MZSCHEME_DLLS=$(MZSCHEME) MZSCHEME_DLLS=$(MZSCHEME)
endif endif
MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
endif endif
endif endif
@ -562,6 +562,9 @@ clean:
-$(DEL) pathdef.c -$(DEL) pathdef.c
ifdef PERL ifdef PERL
-$(DEL) if_perl.c -$(DEL) if_perl.c
endif
ifdef MZSCHEME
-$(DEL) mzscheme_base.c
endif endif
$(MAKE) -C GvimExt -f Make_ming.mak clean $(MAKE) -C GvimExt -f Make_ming.mak clean
$(MAKE) -C xxd -f Make_cyg.mak clean $(MAKE) -C xxd -f Make_cyg.mak clean

View File

@ -865,6 +865,7 @@ clean:
- if exist dimm_i.c del dimm_i.c - if exist dimm_i.c del dimm_i.c
- if exist dimm.tlb del dimm.tlb - if exist dimm.tlb del dimm.tlb
- if exist dosinst.exe del dosinst.exe - if exist dosinst.exe del dosinst.exe
- if exist mzscheme_base.c del mzscheme_base.c
cd xxd cd xxd
$(MAKE) /NOLOGO -f Make_mvc.mak clean $(MAKE) /NOLOGO -f Make_mvc.mak clean
cd .. cd ..

View File

@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
248,
/**/ /**/
247, 247,
/**/ /**/