projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 05b5d6bc AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.344 (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.344 (extra, after 6.2.337) | |
| 11 | Problem: Cannot build gvimext.dll with MingW on Linux. | |
| 12 | Solution: Add support for cross compiling. (Ronald Hoellwarth) | |
| 13 | Files: src/GvimExt/Make_ming.mak | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.343/src/GvimExt/Make_ming.mak Tue Mar 9 19:41:00 2004 | |
| 17 | --- src/GvimExt/Make_ming.mak Wed Mar 10 21:26:36 2004 | |
| 18 | *************** | |
| 19 | *** 7,19 **** | |
| 20 | # already loaded in memory. The binary image contains as well information | |
| 21 | # for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29 | |
| 22 | ||
| 23 | ! CXX := g++ | |
| 24 | CXXFLAGS := -O2 -mno-cygwin | |
| 25 | ! LIBS := -luuid | |
| 26 | WINDRES := windres.exe | |
| 27 | RES := gvimext.res | |
| 28 | DEFFILE = gvimext_ming.def | |
| 29 | ! OBJ := gvimext.o | |
| 30 | ||
| 31 | DLL := gvimext.dll | |
| 32 | ||
| 33 | --- 7,41 ---- | |
| 34 | # already loaded in memory. The binary image contains as well information | |
| 35 | # for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29 | |
| 36 | ||
| 37 | ! # If cross-compiling set this to yes, else set it to no | |
| 38 | ! CROSS = no | |
| 39 | ! #CROSS = yes | |
| 40 | ! # For the old MinGW 2.95 (the one you get e.g. with debian woody) | |
| 41 | ! # set the following variable to yes and check if the executables are | |
| 42 | ! # really named that way. | |
| 43 | ! # If you have a newer MinGW or you are using cygwin set it to no and | |
| 44 | ! # check also the executables | |
| 45 | ! MINGWOLD = no | |
| 46 | ! | |
| 47 | ! ifeq ($(CROSS),yes) | |
| 48 | ! ifeq ($(MINGWOLD),yes) | |
| 49 | ! CXX = i586-mingw32msvc-g++ | |
| 50 | ! CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks | |
| 51 | ! WINDRES = i586-mingw32msvc-windres | |
| 52 | ! else | |
| 53 | ! CXX = i386-mingw32msvc-g++ | |
| 54 | CXXFLAGS := -O2 -mno-cygwin | |
| 55 | ! WINDRES = i386-mingw32msvc-windres | |
| 56 | ! endif | |
| 57 | ! else | |
| 58 | ! CXX := g++.exe | |
| 59 | WINDRES := windres.exe | |
| 60 | + CXXFLAGS := -O2 -mno-cygwin | |
| 61 | + endif | |
| 62 | + LIBS := -luuid | |
| 63 | RES := gvimext.res | |
| 64 | DEFFILE = gvimext_ming.def | |
| 65 | ! OBJ := gvimext.o | |
| 66 | ||
| 67 | DLL := gvimext.dll | |
| 68 | ||
| 69 | *************** | |
| 70 | *** 22,40 **** | |
| 71 | all: all-before $(DLL) all-after | |
| 72 | ||
| 73 | $(DLL): $(OBJ) $(RES) $(DEFFILE) | |
| 74 | ! $(CXX) -shared $(CXXFLAGS) -s -o $@ \ | |
| 75 | -Wl,--enable-auto-image-base \ | |
| 76 | ! -Wl,--enable-auto-import \ | |
| 77 | ! -Wl,--whole-archive \ | |
| 78 | ! $^ \ | |
| 79 | ! -Wl,--no-whole-archive \ | |
| 80 | $(LIBS) | |
| 81 | ||
| 82 | gvimext.o: gvimext.cpp | |
| 83 | ! $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $^ -o $@ | |
| 84 | ||
| 85 | $(RES): gvimext_ming.rc | |
| 86 | ! $(WINDRES) --input-format=rc --output-format=coff -DMING $^ -o $@ | |
| 87 | ||
| 88 | clean: clean-custom | |
| 89 | $(RM) $(OBJ) $(RES) $(DLL) | |
| 90 | --- 44,62 ---- | |
| 91 | all: all-before $(DLL) all-after | |
| 92 | ||
| 93 | $(DLL): $(OBJ) $(RES) $(DEFFILE) | |
| 94 | ! $(CXX) -shared $(CXXFLAGS) -s -o $@ \ | |
| 95 | -Wl,--enable-auto-image-base \ | |
| 96 | ! -Wl,--enable-auto-import \ | |
| 97 | ! -Wl,--whole-archive \ | |
| 98 | ! $^ \ | |
| 99 | ! -Wl,--no-whole-archive \ | |
| 100 | $(LIBS) | |
| 101 | ||
| 102 | gvimext.o: gvimext.cpp | |
| 103 | ! $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@ | |
| 104 | ||
| 105 | $(RES): gvimext_ming.rc | |
| 106 | ! $(WINDRES) --input-format=rc --output-format=coff -DMING $? -o $@ | |
| 107 | ||
| 108 | clean: clean-custom | |
| 109 | $(RM) $(OBJ) $(RES) $(DLL) | |
| 110 | *** ../vim-6.2.343/src/version.c Thu Mar 11 20:55:09 2004 | |
| 111 | --- src/version.c Thu Mar 11 20:58:09 2004 | |
| 112 | *************** | |
| 113 | *** 639,640 **** | |
| 114 | --- 639,642 ---- | |
| 115 | { /* Add new patch number below this line */ | |
| 116 | + /**/ | |
| 117 | + 344, | |
| 118 | /**/ | |
| 119 | ||
| 120 | -- | |
| 121 | The goal of science is to build better mousetraps. | |
| 122 | The goal of nature is to build better mice. | |
| 123 | ||
| 124 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 125 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 126 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 127 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |