]>
Commit | Line | Data |
---|---|---|
4ff12b6a ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.248 (extra) | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.2.248 (extra) | |
11 | Problem: Mzscheme interface building minor problems. | |
12 | Solution: Update Win32 makefiles. (Sergey Khorev) | |
13 | Files: src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak | |
14 | ||
15 | ||
16 | *** ../vim-7.2.247/src/Make_cyg.mak 2007-09-30 22:28:48.000000000 +0200 | |
17 | --- src/Make_cyg.mak 2009-09-11 11:23:23.000000000 +0200 | |
18 | *************** | |
19 | *** 212,224 **** | |
20 | MZSCHEME_VER = 209_000 | |
21 | endif | |
22 | ||
23 | ifeq (yes, $(DYNAMIC_MZSCHEME)) | |
24 | DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" | |
25 | else | |
26 | ifndef MZSCHEME_DLLS | |
27 | MZSCHEME_DLLS = $(MZSCHEME) | |
28 | endif | |
29 | ! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER) | |
30 | endif | |
31 | endif | |
32 | ||
33 | --- 212,245 ---- | |
34 | MZSCHEME_VER = 209_000 | |
35 | endif | |
36 | ||
37 | + ifndef MZSCHEME_PRECISE_GC | |
38 | + MZSCHEME_PRECISE_GC=no | |
39 | + endif | |
40 | + | |
41 | + # for version 4.x we need to generate byte-code for Scheme base | |
42 | + ifndef MZSCHEME_GENERATE_BASE | |
43 | + MZSCHEME_GENERATE_BASE=no | |
44 | + endif | |
45 | + | |
46 | ifeq (yes, $(DYNAMIC_MZSCHEME)) | |
47 | DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" | |
48 | else | |
49 | ifndef MZSCHEME_DLLS | |
50 | MZSCHEME_DLLS = $(MZSCHEME) | |
51 | endif | |
52 | ! ifeq (yes,$(MZSCHEME_PRECISE_GC)) | |
53 | ! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER) | |
54 | ! else | |
55 | ! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER) | |
56 | ! endif | |
57 | ! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB) | |
58 | ! endif | |
59 | ! ifeq (yes,$(MZSCHEME_GENERATE_BASE)) | |
60 | ! DEFINES += -DINCLUDE_MZSCHEME_BASE | |
61 | ! MZ_EXTRA_DEP += mzscheme_base.c | |
62 | ! endif | |
63 | ! ifeq (yes,$(MZSCHEME_PRECISE_GC)) | |
64 | ! DEFINES += -DMZ_PRECISE_GC | |
65 | endif | |
66 | endif | |
67 | ||
68 | *************** | |
69 | *** 473,478 **** | |
70 | --- 494,502 ---- | |
71 | ifdef PERL | |
72 | -$(DEL) if_perl.c | |
73 | endif | |
74 | + ifdef MZSCHEME | |
75 | + -$(DEL) mzscheme_base.c | |
76 | + endif | |
77 | -$(DEL) pathdef.c | |
78 | $(MAKE) -C xxd -f Make_cyg.mak clean | |
79 | $(MAKE) -C GvimExt -f Make_ming.mak clean | |
80 | *************** | |
81 | *** 523,531 **** | |
82 | --- 547,561 ---- | |
83 | $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_DEP) | |
84 | $(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o | |
85 | ||
86 | + $(OUTDIR)/if_mzsch.o: if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP) | |
87 | + $(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o | |
88 | + | |
89 | $(OUTDIR)/vimrc.o: vim.rc version.h gui_w32_rc.h | |
90 | $(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o | |
91 | ||
92 | + mzscheme_base.c: | |
93 | + $(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base | |
94 | + | |
95 | pathdef.c: $(INCL) | |
96 | ifneq (sh.exe, $(SHELL)) | |
97 | @echo creating pathdef.c | |
98 | *** ../vim-7.2.247/src/Make_ming.mak 2009-05-26 22:58:43.000000000 +0200 | |
99 | --- src/Make_ming.mak 2009-09-11 11:23:28.000000000 +0200 | |
100 | *************** | |
101 | *** 135,141 **** | |
102 | ifndef MZSCHEME_DLLS | |
103 | MZSCHEME_DLLS=$(MZSCHEME) | |
104 | endif | |
105 | ! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) | |
106 | endif | |
107 | ||
108 | endif | |
109 | --- 135,141 ---- | |
110 | ifndef MZSCHEME_DLLS | |
111 | MZSCHEME_DLLS=$(MZSCHEME) | |
112 | endif | |
113 | ! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib | |
114 | endif | |
115 | ||
116 | endif | |
117 | *************** | |
118 | *** 563,568 **** | |
119 | --- 563,571 ---- | |
120 | ifdef PERL | |
121 | -$(DEL) if_perl.c | |
122 | endif | |
123 | + ifdef MZSCHEME | |
124 | + -$(DEL) mzscheme_base.c | |
125 | + endif | |
126 | $(MAKE) -C GvimExt -f Make_ming.mak clean | |
127 | $(MAKE) -C xxd -f Make_cyg.mak clean | |
128 | ||
129 | *** ../vim-7.2.247/src/Make_mvc.mak 2009-06-16 16:45:14.000000000 +0200 | |
130 | --- src/Make_mvc.mak 2009-09-11 11:23:28.000000000 +0200 | |
131 | *************** | |
132 | *** 865,870 **** | |
133 | --- 865,871 ---- | |
134 | - if exist dimm_i.c del dimm_i.c | |
135 | - if exist dimm.tlb del dimm.tlb | |
136 | - if exist dosinst.exe del dosinst.exe | |
137 | + - if exist mzscheme_base.c del mzscheme_base.c | |
138 | cd xxd | |
139 | $(MAKE) /NOLOGO -f Make_mvc.mak clean | |
140 | cd .. | |
141 | *** ../vim-7.2.247/src/version.c 2009-09-11 12:20:47.000000000 +0200 | |
142 | --- src/version.c 2009-09-11 12:48:26.000000000 +0200 | |
143 | *************** | |
144 | *** 678,679 **** | |
145 | --- 678,681 ---- | |
146 | { /* Add new patch number below this line */ | |
147 | + /**/ | |
148 | + 248, | |
149 | /**/ | |
150 | ||
151 | -- | |
152 | hundred-and-one symptoms of being an internet addict: | |
153 | 222. You send more than 20 personal e-mails a day. | |
154 | ||
155 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
156 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
157 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
158 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |