]>
Commit | Line | Data |
---|---|---|
c734f094 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.319 (extra) | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 6.2.319 (extra) | |
11 | Problem: Building gvimext.dll with Mingw doesn't work properly. | |
12 | Solution: Use gcc instead of dllwrap. Use long option names. (Alejandro | |
13 | Lopez-Valencia) | |
14 | Files: src/GvimExt/Make_ming.mak | |
15 | ||
16 | ||
17 | *** ../vim-6.2.318/src/GvimExt/Make_ming.mak Sun May 4 11:49:25 2003 | |
18 | --- src/GvimExt/Make_ming.mak Sun Feb 29 17:29:25 2004 | |
19 | *************** | |
20 | *** 2,44 **** | |
21 | # Generates gvimext.dll with gcc. | |
22 | # Can be used for Cygwin and MingW (MingW ignores -mno-cygwin) | |
23 | # | |
24 | ! CPP := g++.exe | |
25 | ! CC := gcc.exe | |
26 | CXXFLAGS := -O2 -mno-cygwin | |
27 | LIBS := -luuid | |
28 | WINDRES := windres.exe | |
29 | - DLLWRAP = dllwrap.exe | |
30 | RES := gvimext.res | |
31 | DEFFILE = gvimext_ming.def | |
32 | ! STATICLIB = gvimext.a | |
33 | ! EXPLIB = gvimext.exp | |
34 | ! OBJ := gvimext.o $(RES) | |
35 | ||
36 | - INCS := | |
37 | DLL := gvimext.dll | |
38 | ||
39 | .PHONY: all all-before all-after clean clean-custom | |
40 | ||
41 | all: all-before $(DLL) all-after | |
42 | ||
43 | ||
44 | ! clean: clean-custom | |
45 | ! ${RM} $(OBJ) $(DLL) ${RES} ${EXPLIB} $(STATICLIB) | |
46 | ! | |
47 | ||
48 | ! $(DLL): $(OBJ) | |
49 | ! $(DLLWRAP) \ | |
50 | ! --def $(DEFFILE) \ | |
51 | ! --output-exp ${EXPLIB} \ | |
52 | ! --image-base 0x1C000000 \ | |
53 | ! --driver-name c++ \ | |
54 | ! --implib $(STATICLIB) \ | |
55 | ! $(OBJ) $(LIBS) \ | |
56 | ! --target=i386-mingw32 -mno-cygwin \ | |
57 | ! -o $(DLL) -s | |
58 | ||
59 | ! gvimext.o: gvimext.cpp | |
60 | ! $(CPP) -c $? -o $@ $(CXXFLAGS) -DFEAT_GETTEXT | |
61 | ||
62 | - ${RES}: gvimext_ming.rc | |
63 | - $(WINDRES) $? -I rc -o $@ -O coff -DMING | |
64 | --- 2,41 ---- | |
65 | # Generates gvimext.dll with gcc. | |
66 | # Can be used for Cygwin and MingW (MingW ignores -mno-cygwin) | |
67 | # | |
68 | ! # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 | |
69 | ! # Now it is allocated dymanically by the linker by evaluating all DLLs | |
70 | ! # already loaded in memory. The binary image contains as well information | |
71 | ! # for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29 | |
72 | ! | |
73 | ! CXX := g++ | |
74 | CXXFLAGS := -O2 -mno-cygwin | |
75 | LIBS := -luuid | |
76 | WINDRES := windres.exe | |
77 | RES := gvimext.res | |
78 | DEFFILE = gvimext_ming.def | |
79 | ! OBJ := gvimext.o | |
80 | ||
81 | DLL := gvimext.dll | |
82 | ||
83 | .PHONY: all all-before all-after clean clean-custom | |
84 | ||
85 | all: all-before $(DLL) all-after | |
86 | ||
87 | + $(DLL): $(OBJ) $(RES) $(DEFFILE) | |
88 | + $(CXX) -shared $(CXXFLAGS) -s -o $@ \ | |
89 | + -Wl,--enable-auto-image-base \ | |
90 | + -Wl,--enable-auto-import \ | |
91 | + -Wl,--whole-archive \ | |
92 | + $^ \ | |
93 | + -Wl,--no-whole-archive \ | |
94 | + $(LIBS) | |
95 | ||
96 | ! gvimext.o: gvimext.cpp | |
97 | ! $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@ | |
98 | ||
99 | ! $(RES): gvimext_ming.rc | |
100 | ! $(WINDRES) --input-format=rc --output-format=coff -DMING $? -o $@ | |
101 | ||
102 | ! clean: clean-custom | |
103 | ! ${RM} $(OBJ) $(RES) $(DLL) | |
104 | ||
105 | *** ../vim-6.2.318/src/version.c Fri Mar 5 15:21:09 2004 | |
106 | --- src/version.c Sat Mar 6 21:03:41 2004 | |
107 | *************** | |
108 | *** 639,640 **** | |
109 | --- 639,642 ---- | |
110 | { /* Add new patch number below this line */ | |
111 | + /**/ | |
112 | + 319, | |
113 | /**/ | |
114 | ||
115 | -- | |
116 | Dogs must have a permit signed by the mayor in order to congregate in groups | |
117 | of three or more on private property. | |
118 | [real standing law in Oklahoma, United States of America] | |
119 | ||
120 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
121 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
122 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
123 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |