projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8587d00a AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.377 (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.377 (extra, after 7.2.372) | |
| 11 | Problem: Misplaced assignment. Duplicate build line for gvimext.dll. | |
| 12 | Solution: Move setting CROSS_COMPILE to before ifneq. Remove the wrong | |
| 13 | build line. (Markus Heidelberg) | |
| 14 | Files: src/Make_ming.mak | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.2.376/src/Make_ming.mak 2010-02-24 15:07:45.000000000 +0100 | |
| 18 | --- src/Make_ming.mak 2010-02-26 22:01:07.000000000 +0100 | |
| 19 | *************** | |
| 20 | *** 248,255 **** | |
| 21 | DIRSLASH = / | |
| 22 | else | |
| 23 | # normal (Windows) compilation: | |
| 24 | - ifneq (sh.exe, $(SHELL)) | |
| 25 | CROSS_COMPILE = | |
| 26 | DEL = rm | |
| 27 | MKDIR = mkdir -p | |
| 28 | DIRSLASH = / | |
| 29 | --- 248,255 ---- | |
| 30 | DIRSLASH = / | |
| 31 | else | |
| 32 | # normal (Windows) compilation: | |
| 33 | CROSS_COMPILE = | |
| 34 | + ifneq (sh.exe, $(SHELL)) | |
| 35 | DEL = rm | |
| 36 | MKDIR = mkdir -p | |
| 37 | DIRSLASH = / | |
| 38 | *************** | |
| 39 | *** 553,559 **** | |
| 40 | $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) | |
| 41 | ||
| 42 | GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h | |
| 43 | - $(MAKE) -C GvimExt -f Make_ming.mak | |
| 44 | $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) | |
| 45 | ||
| 46 | clean: | |
| 47 | --- 553,558 ---- | |
| 48 | *** ../vim-7.2.376/src/version.c 2010-02-24 17:22:14.000000000 +0100 | |
| 49 | --- src/version.c 2010-02-26 22:01:45.000000000 +0100 | |
| 50 | *************** | |
| 51 | *** 683,684 **** | |
| 52 | --- 683,686 ---- | |
| 53 | { /* Add new patch number below this line */ | |
| 54 | + /**/ | |
| 55 | + 377, | |
| 56 | /**/ | |
| 57 | ||
| 58 | -- | |
| 59 | FIRST HEAD: All right! All right! We'll kill him first and then have tea and | |
| 60 | biscuits. | |
| 61 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 62 | ||
| 63 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 64 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 65 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 66 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |