diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-09-19 20:49:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-09-19 20:49:04 +0200 |
| commit | e237593e872b46a6fc7bc6e3d5072b77610761e0 (patch) | |
| tree | 488ec74651ada0475f445799270072764fbecc15 | |
| parent | 28f5761a603ec5f95d2652bb57ada728d1c2977d (diff) | |
| download | vim-e237593e872b46a6fc7bc6e3d5072b77610761e0.tar.gz | |
Problem: The -mno-cygwin argument is no longer supported by Cygwin.
Solution: Remove the arguments. (Steve Hall)
| -rw-r--r-- | src/GvimExt/Make_cyg.mak | 6 | ||||
| -rw-r--r-- | src/Make_cyg.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/Make_cyg.mak | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/GvimExt/Make_cyg.mak b/src/GvimExt/Make_cyg.mak index 80a2a65d..a638688b 100644 --- a/src/GvimExt/Make_cyg.mak +++ b/src/GvimExt/Make_cyg.mak @@ -31,12 +31,12 @@ endif ifeq ($(CROSS),yes) DEL = rm ifeq ($(MINGWOLD),yes) -CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks +CXXFLAGS := -O2 -fvtable-thunks else -CXXFLAGS := -O2 -mno-cygwin +CXXFLAGS := -O2 endif else -CXXFLAGS := -O2 -mno-cygwin +CXXFLAGS := -O2 ifneq (sh.exe, $(SHELL)) DEL = rm else diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak index f955b4d0..ee51c240 100644 --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -1,6 +1,6 @@ # # Makefile for VIM on Win32, using Cygnus gcc -# Last updated by Dan Sharp. Last Change: 2013 Apr 22 +# Last updated by Dan Sharp. Last Change: 2013 Sep 19 # # Also read INSTALLpc.txt! # @@ -439,8 +439,6 @@ endif ############################## ifeq (yes, $(USEDLL)) DEFINES += -D_MAX_PATH=256 -D__CYGWIN__ -else -INCLUDES += -mno-cygwin endif ############################## diff --git a/src/version.c b/src/version.c index 5faeb35b..272940af 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 30, +/**/ 29, /**/ 28, diff --git a/src/xxd/Make_cyg.mak b/src/xxd/Make_cyg.mak index ba74b180..4f344f03 100644 --- a/src/xxd/Make_cyg.mak +++ b/src/xxd/Make_cyg.mak @@ -8,7 +8,7 @@ ifeq (yes, $(USEDLL)) DEFINES = LIBS = -lc else -DEFINES = -mno-cygwin +DEFINES = LIBS = endif |