projects / people / amarx / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 17e7d110 SS |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.3.018 | |
| 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.018 (after 7.3.012) | |
| 11 | Problem: Missing argument to windres in MingW makefiles. | |
| 12 | Solution: Add the argument that was wrapped in the patch. (Jon Maken) | |
| 13 | Files: src/Make_ming.mak, src/GvimExt/Make_ming.mak | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.017/src/Make_ming.mak 2010-09-29 12:37:53.000000000 +0200 | |
| 17 | --- src/Make_ming.mak 2010-09-29 18:37:08.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 303,309 **** | |
| 20 | endif | |
| 21 | endif | |
| 22 | CC := $(CROSS_COMPILE)gcc | |
| 23 | ! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" - | |
| 24 | ||
| 25 | #>>>>> end of choices | |
| 26 | ########################################################################### | |
| 27 | --- 303,309 ---- | |
| 28 | endif | |
| 29 | endif | |
| 30 | CC := $(CROSS_COMPILE)gcc | |
| 31 | ! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -DRC_INVOKED | |
| 32 | ||
| 33 | #>>>>> end of choices | |
| 34 | ########################################################################### | |
| 35 | *** ../vim-7.3.017/src/GvimExt/Make_ming.mak 2010-09-29 12:37:53.000000000 +0200 | |
| 36 | --- src/GvimExt/Make_ming.mak 2010-09-29 18:36:39.000000000 +0200 | |
| 37 | *************** | |
| 38 | *** 33,39 **** | |
| 39 | endif | |
| 40 | endif | |
| 41 | CXX := $(CROSS_COMPILE)g++ | |
| 42 | ! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" - | |
| 43 | LIBS := -luuid | |
| 44 | RES := gvimext.res | |
| 45 | DEFFILE = gvimext_ming.def | |
| 46 | --- 33,39 ---- | |
| 47 | endif | |
| 48 | endif | |
| 49 | CXX := $(CROSS_COMPILE)g++ | |
| 50 | ! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED | |
| 51 | LIBS := -luuid | |
| 52 | RES := gvimext.res | |
| 53 | DEFFILE = gvimext_ming.def | |
| 54 | *** ../vim-7.3.017/src/version.c 2010-09-29 18:32:47.000000000 +0200 | |
| 55 | --- src/version.c 2010-09-29 18:41:53.000000000 +0200 | |
| 56 | *************** | |
| 57 | *** 716,717 **** | |
| 58 | --- 716,719 ---- | |
| 59 | { /* Add new patch number below this line */ | |
| 60 | + /**/ | |
| 61 | + 18, | |
| 62 | /**/ | |
| 63 | ||
| 64 | -- | |
| 65 | hundred-and-one symptoms of being an internet addict: | |
| 66 | 231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner | |
| 67 | in the front doorway permanently so it always looks like you are | |
| 68 | actually attempting to do something about that mess that has amassed | |
| 69 | since you discovered the Internet. | |
| 70 | ||
| 71 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 72 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 73 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 74 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |