Karsten Hopp 87c190
To: vim-dev@vim.org
Karsten Hopp 87c190
Subject: Patch 7.2.248 (extra)
Karsten Hopp 87c190
Fcc: outbox
Karsten Hopp 87c190
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 87c190
Mime-Version: 1.0
Karsten Hopp 87c190
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 87c190
Content-Transfer-Encoding: 8bit
Karsten Hopp 87c190
------------
Karsten Hopp 87c190
Karsten Hopp 87c190
Patch 7.2.248 (extra)
Karsten Hopp 87c190
Problem:    Mzscheme interface building minor problems.
Karsten Hopp 87c190
Solution:   Update Win32 makefiles. (Sergey Khorev)
Karsten Hopp 87c190
Files:	    src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak
Karsten Hopp 87c190
Karsten Hopp 87c190
Karsten Hopp 87c190
*** ../vim-7.2.247/src/Make_cyg.mak	2007-09-30 22:28:48.000000000 +0200
Karsten Hopp 87c190
--- src/Make_cyg.mak	2009-09-11 11:23:23.000000000 +0200
Karsten Hopp 87c190
***************
Karsten Hopp 87c190
*** 212,224 ****
Karsten Hopp 87c190
  MZSCHEME_VER = 209_000
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  
Karsten Hopp 87c190
  ifeq (yes, $(DYNAMIC_MZSCHEME))
Karsten Hopp 87c190
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
Karsten Hopp 87c190
  else
Karsten Hopp 87c190
  ifndef MZSCHEME_DLLS
Karsten Hopp 87c190
  MZSCHEME_DLLS = $(MZSCHEME)
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  
Karsten Hopp 87c190
--- 212,245 ----
Karsten Hopp 87c190
  MZSCHEME_VER = 209_000
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  
Karsten Hopp 87c190
+ ifndef MZSCHEME_PRECISE_GC
Karsten Hopp 87c190
+ MZSCHEME_PRECISE_GC=no
Karsten Hopp 87c190
+ endif
Karsten Hopp 87c190
+ 
Karsten Hopp 87c190
+ # for version 4.x we need to generate byte-code for Scheme base
Karsten Hopp 87c190
+ ifndef MZSCHEME_GENERATE_BASE
Karsten Hopp 87c190
+ MZSCHEME_GENERATE_BASE=no
Karsten Hopp 87c190
+ endif
Karsten Hopp 87c190
+ 
Karsten Hopp 87c190
  ifeq (yes, $(DYNAMIC_MZSCHEME))
Karsten Hopp 87c190
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
Karsten Hopp 87c190
  else
Karsten Hopp 87c190
  ifndef MZSCHEME_DLLS
Karsten Hopp 87c190
  MZSCHEME_DLLS = $(MZSCHEME)
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
Karsten Hopp 87c190
! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
Karsten Hopp 87c190
! else
Karsten Hopp 87c190
! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
Karsten Hopp 87c190
! endif
Karsten Hopp 87c190
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
Karsten Hopp 87c190
! endif
Karsten Hopp 87c190
! ifeq (yes,$(MZSCHEME_GENERATE_BASE))
Karsten Hopp 87c190
! DEFINES += -DINCLUDE_MZSCHEME_BASE
Karsten Hopp 87c190
! MZ_EXTRA_DEP += mzscheme_base.c
Karsten Hopp 87c190
! endif
Karsten Hopp 87c190
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
Karsten Hopp 87c190
! DEFINES += -DMZ_PRECISE_GC
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  
Karsten Hopp 87c190
***************
Karsten Hopp 87c190
*** 473,478 ****
Karsten Hopp 87c190
--- 494,502 ----
Karsten Hopp 87c190
  ifdef PERL
Karsten Hopp 87c190
  	-$(DEL) if_perl.c
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
+ ifdef MZSCHEME
Karsten Hopp 87c190
+ 	-$(DEL) mzscheme_base.c
Karsten Hopp 87c190
+ endif
Karsten Hopp 87c190
  	-$(DEL) pathdef.c
Karsten Hopp 87c190
  	$(MAKE) -C xxd -f Make_cyg.mak clean
Karsten Hopp 87c190
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
Karsten Hopp 87c190
***************
Karsten Hopp 87c190
*** 523,531 ****
Karsten Hopp 87c190
--- 547,561 ----
Karsten Hopp 87c190
  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_DEP)
Karsten Hopp 87c190
  	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
Karsten Hopp 87c190
  
Karsten Hopp 87c190
+ $(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
Karsten Hopp 87c190
+ 	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
Karsten Hopp 87c190
+ 
Karsten Hopp 87c190
  $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
Karsten Hopp 87c190
  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
Karsten Hopp 87c190
  
Karsten Hopp 87c190
+ mzscheme_base.c:
Karsten Hopp 87c190
+ 	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
Karsten Hopp 87c190
+ 
Karsten Hopp 87c190
  pathdef.c: $(INCL)
Karsten Hopp 87c190
  ifneq (sh.exe, $(SHELL))
Karsten Hopp 87c190
  	@echo creating pathdef.c
Karsten Hopp 87c190
*** ../vim-7.2.247/src/Make_ming.mak	2009-05-26 22:58:43.000000000 +0200
Karsten Hopp 87c190
--- src/Make_ming.mak	2009-09-11 11:23:28.000000000 +0200
Karsten Hopp 87c190
***************
Karsten Hopp 87c190
*** 135,141 ****
Karsten Hopp 87c190
  ifndef MZSCHEME_DLLS
Karsten Hopp 87c190
  MZSCHEME_DLLS=$(MZSCHEME)
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
--- 135,141 ----
Karsten Hopp 87c190
  ifndef MZSCHEME_DLLS
Karsten Hopp 87c190
  MZSCHEME_DLLS=$(MZSCHEME)
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
  
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
***************
Karsten Hopp 87c190
*** 563,568 ****
Karsten Hopp 87c190
--- 563,571 ----
Karsten Hopp 87c190
  ifdef PERL
Karsten Hopp 87c190
  	-$(DEL) if_perl.c
Karsten Hopp 87c190
  endif
Karsten Hopp 87c190
+ ifdef MZSCHEME
Karsten Hopp 87c190
+ 	-$(DEL) mzscheme_base.c
Karsten Hopp 87c190
+ endif
Karsten Hopp 87c190
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
Karsten Hopp 87c190
  	$(MAKE) -C xxd -f Make_cyg.mak clean
Karsten Hopp 87c190
  
Karsten Hopp 87c190
*** ../vim-7.2.247/src/Make_mvc.mak	2009-06-16 16:45:14.000000000 +0200
Karsten Hopp 87c190
--- src/Make_mvc.mak	2009-09-11 11:23:28.000000000 +0200
Karsten Hopp 87c190
***************
Karsten Hopp 87c190
*** 865,870 ****
Karsten Hopp 87c190
--- 865,871 ----
Karsten Hopp 87c190
  	- if exist dimm_i.c del dimm_i.c
Karsten Hopp 87c190
  	- if exist dimm.tlb del dimm.tlb
Karsten Hopp 87c190
  	- if exist dosinst.exe del dosinst.exe
Karsten Hopp 87c190
+ 	- if exist mzscheme_base.c del mzscheme_base.c
Karsten Hopp 87c190
  	cd xxd
Karsten Hopp 87c190
  	$(MAKE) /NOLOGO -f Make_mvc.mak clean
Karsten Hopp 87c190
  	cd ..
Karsten Hopp 87c190
*** ../vim-7.2.247/src/version.c	2009-09-11 12:20:47.000000000 +0200
Karsten Hopp 87c190
--- src/version.c	2009-09-11 12:48:26.000000000 +0200
Karsten Hopp 87c190
***************
Karsten Hopp 87c190
*** 678,679 ****
Karsten Hopp 87c190
--- 678,681 ----
Karsten Hopp 87c190
  {   /* Add new patch number below this line */
Karsten Hopp 87c190
+ /**/
Karsten Hopp 87c190
+     248,
Karsten Hopp 87c190
  /**/
Karsten Hopp 87c190
Karsten Hopp 87c190
-- 
Karsten Hopp 87c190
hundred-and-one symptoms of being an internet addict:
Karsten Hopp 87c190
222. You send more than 20 personal e-mails a day.
Karsten Hopp 87c190
Karsten Hopp 87c190
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 87c190
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 87c190
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 87c190
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///