]>
Commit | Line | Data |
---|---|---|
c6060300 MT |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.326 | |
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.3.326 | |
11 | Problem: MingW 4.6 no longer supports the -mno-cygwin option. | |
12 | Solution: Split the Cygwin and MingW makefiles. (Matsushita Shougo) | |
13 | Files: src/GvimExt/Make_cyg.mak, src/GvimExt/Make_ming.mak, | |
14 | src/Make_cyg.mak, src/Make_ming.mak, src/xxd/Make_ming.mak, | |
15 | Filelist | |
16 | ||
17 | ||
18 | *** ../vim-7.3.325/src/GvimExt/Make_cyg.mak 2011-09-30 16:55:18.000000000 +0200 | |
19 | --- src/GvimExt/Make_cyg.mak 2011-09-30 16:45:49.000000000 +0200 | |
20 | *************** | |
21 | *** 0 **** | |
22 | --- 1,77 ---- | |
23 | + # Project: gvimext | |
24 | + # Generates gvimext.dll with gcc. | |
25 | + # To be used with Cygwin. | |
26 | + # | |
27 | + # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 | |
28 | + # Now it is allocated dymanically by the linker by evaluating all DLLs | |
29 | + # already loaded in memory. The binary image contains as well information | |
30 | + # for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29 | |
31 | + | |
32 | + # If cross-compiling set this to yes, else set it to no | |
33 | + CROSS = no | |
34 | + #CROSS = yes | |
35 | + # For the old MinGW 2.95 (the one you get e.g. with debian woody) | |
36 | + # set the following variable to yes and check if the executables are | |
37 | + # really named that way. | |
38 | + # If you have a newer MinGW or you are using cygwin set it to no and | |
39 | + # check also the executables | |
40 | + MINGWOLD = no | |
41 | + | |
42 | + # Link against the shared versions of libgcc/libstdc++ by default. Set | |
43 | + # STATIC_STDCPLUS to "yes" to link against static versions instead. | |
44 | + STATIC_STDCPLUS=no | |
45 | + #STATIC_STDCPLUS=yes | |
46 | + | |
47 | + # Note: -static-libstdc++ is not available until gcc 4.5.x. | |
48 | + LDFLAGS += -shared | |
49 | + ifeq (yes, $(STATIC_STDCPLUS)) | |
50 | + LDFLAGS += -static-libgcc -static-libstdc++ | |
51 | + endif | |
52 | + | |
53 | + ifeq ($(CROSS),yes) | |
54 | + DEL = rm | |
55 | + ifeq ($(MINGWOLD),yes) | |
56 | + CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks | |
57 | + else | |
58 | + CXXFLAGS := -O2 -mno-cygwin | |
59 | + endif | |
60 | + else | |
61 | + CXXFLAGS := -O2 -mno-cygwin | |
62 | + ifneq (sh.exe, $(SHELL)) | |
63 | + DEL = rm | |
64 | + else | |
65 | + DEL = del | |
66 | + endif | |
67 | + endif | |
68 | + CXX := $(CROSS_COMPILE)g++ | |
69 | + WINDRES := $(CROSS_COMPILE)windres | |
70 | + WINDRES_CXX = $(CXX) | |
71 | + WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED | |
72 | + LIBS := -luuid | |
73 | + RES := gvimext.res | |
74 | + DEFFILE = gvimext_ming.def | |
75 | + OBJ := gvimext.o | |
76 | + | |
77 | + DLL := gvimext.dll | |
78 | + | |
79 | + .PHONY: all all-before all-after clean clean-custom | |
80 | + | |
81 | + all: all-before $(DLL) all-after | |
82 | + | |
83 | + $(DLL): $(OBJ) $(RES) $(DEFFILE) | |
84 | + $(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \ | |
85 | + -Wl,--enable-auto-image-base \ | |
86 | + -Wl,--enable-auto-import \ | |
87 | + -Wl,--whole-archive \ | |
88 | + $^ \ | |
89 | + -Wl,--no-whole-archive \ | |
90 | + $(LIBS) | |
91 | + | |
92 | + gvimext.o: gvimext.cpp | |
93 | + $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@ | |
94 | + | |
95 | + $(RES): gvimext_ming.rc | |
96 | + $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@ | |
97 | + | |
98 | + clean: clean-custom | |
99 | + -$(DEL) $(OBJ) $(RES) $(DLL) | |
100 | *** ../vim-7.3.325/src/GvimExt/Make_ming.mak 2010-12-30 14:50:46.000000000 +0100 | |
101 | --- src/GvimExt/Make_ming.mak 2011-09-30 16:47:09.000000000 +0200 | |
102 | *************** | |
103 | *** 1,6 **** | |
104 | # Project: gvimext | |
105 | # Generates gvimext.dll with gcc. | |
106 | ! # Can be used for Cygwin and MingW (MingW ignores -mno-cygwin) | |
107 | # | |
108 | # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 | |
109 | # Now it is allocated dymanically by the linker by evaluating all DLLs | |
110 | --- 1,6 ---- | |
111 | # Project: gvimext | |
112 | # Generates gvimext.dll with gcc. | |
113 | ! # To be used with MingW. | |
114 | # | |
115 | # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 | |
116 | # Now it is allocated dymanically by the linker by evaluating all DLLs | |
117 | *************** | |
118 | *** 31,42 **** | |
119 | ifeq ($(CROSS),yes) | |
120 | DEL = rm | |
121 | ifeq ($(MINGWOLD),yes) | |
122 | ! CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks | |
123 | else | |
124 | ! CXXFLAGS := -O2 -mno-cygwin | |
125 | endif | |
126 | else | |
127 | ! CXXFLAGS := -O2 -mno-cygwin | |
128 | ifneq (sh.exe, $(SHELL)) | |
129 | DEL = rm | |
130 | else | |
131 | --- 31,42 ---- | |
132 | ifeq ($(CROSS),yes) | |
133 | DEL = rm | |
134 | ifeq ($(MINGWOLD),yes) | |
135 | ! CXXFLAGS := -O2 -fvtable-thunks | |
136 | else | |
137 | ! CXXFLAGS := -O2 | |
138 | endif | |
139 | else | |
140 | ! CXXFLAGS := -O2 | |
141 | ifneq (sh.exe, $(SHELL)) | |
142 | DEL = rm | |
143 | else | |
144 | *************** | |
145 | *** 75,78 **** | |
146 | ||
147 | clean: clean-custom | |
148 | -$(DEL) $(OBJ) $(RES) $(DLL) | |
149 | - | |
150 | --- 75,77 ---- | |
151 | *** ../vim-7.3.325/src/Make_cyg.mak 2010-11-03 21:59:23.000000000 +0100 | |
152 | --- src/Make_cyg.mak 2011-09-30 16:48:11.000000000 +0200 | |
153 | *************** | |
154 | *** 536,542 **** | |
155 | $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL) | |
156 | ||
157 | GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h | |
158 | ! $(MAKE) -C GvimExt -f Make_ming.mak CROSS_COMPILE=$(CROSS_COMPILE) | |
159 | ||
160 | vimrun.exe: vimrun.c | |
161 | $(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIBS) | |
162 | --- 536,542 ---- | |
163 | $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL) | |
164 | ||
165 | GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h | |
166 | ! $(MAKE) -C GvimExt -f Make_cyg.mak CROSS_COMPILE=$(CROSS_COMPILE) | |
167 | ||
168 | vimrun.exe: vimrun.c | |
169 | $(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIBS) | |
170 | *************** | |
171 | *** 565,571 **** | |
172 | endif | |
173 | -$(DEL) pathdef.c | |
174 | $(MAKE) -C xxd -f Make_cyg.mak clean | |
175 | ! $(MAKE) -C GvimExt -f Make_ming.mak clean | |
176 | ||
177 | distclean: clean | |
178 | -$(DEL) obj$(DIRSLASH)*.o | |
179 | --- 565,571 ---- | |
180 | endif | |
181 | -$(DEL) pathdef.c | |
182 | $(MAKE) -C xxd -f Make_cyg.mak clean | |
183 | ! $(MAKE) -C GvimExt -f Make_cyg.mak clean | |
184 | ||
185 | distclean: clean | |
186 | -$(DEL) obj$(DIRSLASH)*.o | |
187 | *** ../vim-7.3.325/src/Make_ming.mak 2011-09-14 10:49:44.000000000 +0200 | |
188 | --- src/Make_ming.mak 2011-09-30 16:48:11.000000000 +0200 | |
189 | *************** | |
190 | *** 641,647 **** | |
191 | upx vim.exe | |
192 | ||
193 | xxd/xxd.exe: xxd/xxd.c | |
194 | ! $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) | |
195 | ||
196 | GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h | |
197 | $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) | |
198 | --- 641,647 ---- | |
199 | upx vim.exe | |
200 | ||
201 | xxd/xxd.exe: xxd/xxd.c | |
202 | ! $(MAKE) -C xxd -f Make_ming.mak CC=$(CC) | |
203 | ||
204 | GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h | |
205 | $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) | |
206 | *************** | |
207 | *** 659,665 **** | |
208 | -$(DEL) mzscheme_base.c | |
209 | endif | |
210 | $(MAKE) -C GvimExt -f Make_ming.mak clean | |
211 | ! $(MAKE) -C xxd -f Make_cyg.mak clean | |
212 | ||
213 | ########################################################################### | |
214 | INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \ | |
215 | --- 659,665 ---- | |
216 | -$(DEL) mzscheme_base.c | |
217 | endif | |
218 | $(MAKE) -C GvimExt -f Make_ming.mak clean | |
219 | ! $(MAKE) -C xxd -f Make_ming.mak clean | |
220 | ||
221 | ########################################################################### | |
222 | INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \ | |
223 | *** ../vim-7.3.325/src/xxd/Make_ming.mak 2011-09-30 16:55:18.000000000 +0200 | |
224 | --- src/xxd/Make_ming.mak 2011-09-30 16:48:34.000000000 +0200 | |
225 | *************** | |
226 | *** 0 **** | |
227 | --- 1,28 ---- | |
228 | + # The most simplistic Makefile, for MinGW gcc on MS-DOS | |
229 | + | |
230 | + ifndef USEDLL | |
231 | + USEDLL = no | |
232 | + endif | |
233 | + | |
234 | + ifeq (yes, $(USEDLL)) | |
235 | + DEFINES = | |
236 | + LIBS = -lc | |
237 | + else | |
238 | + DEFINES = | |
239 | + LIBS = | |
240 | + endif | |
241 | + | |
242 | + CC = gcc | |
243 | + CFLAGS = -O2 -Wall -DWIN32 $(DEFINES) | |
244 | + | |
245 | + ifneq (sh.exe, $(SHELL)) | |
246 | + DEL = rm | |
247 | + else | |
248 | + DEL = del | |
249 | + endif | |
250 | + | |
251 | + xxd.exe: xxd.c | |
252 | + $(CC) $(CFLAGS) -s -o xxd.exe xxd.c $(LIBS) | |
253 | + | |
254 | + clean: | |
255 | + -$(DEL) xxd.exe | |
256 | *** ../vim-7.3.325/Filelist 2011-06-12 20:36:00.000000000 +0200 | |
257 | --- Filelist 2011-09-30 16:49:29.000000000 +0200 | |
258 | *************** | |
259 | *** 313,318 **** | |
260 | --- 313,319 ---- | |
261 | src/xxd/Make_bc5.mak \ | |
262 | src/xxd/Make_cyg.mak \ | |
263 | src/xxd/Make_djg.mak \ | |
264 | + src/xxd/Make_ming.mak \ | |
265 | src/xxd/Make_mvc.mak \ | |
266 | nsis/gvim.nsi \ | |
267 | nsis/README.txt \ | |
268 | *** ../vim-7.3.325/src/version.c 2011-09-30 16:39:41.000000000 +0200 | |
269 | --- src/version.c 2011-09-30 16:49:57.000000000 +0200 | |
270 | *************** | |
271 | *** 711,712 **** | |
272 | --- 711,714 ---- | |
273 | { /* Add new patch number below this line */ | |
274 | + /**/ | |
275 | + 326, | |
276 | /**/ | |
277 | ||
278 | -- | |
279 | hundred-and-one symptoms of being an internet addict: | |
280 | 33. You name your children Eudora, Mozilla and Dotcom. | |
281 | ||
282 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
283 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
284 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
285 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |