aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-10-10 12:26:34 +1100
committernyamatongwe <devnull@localhost>2011-10-10 12:26:34 +1100
commit0db2ee5ef1861fa6ead62e19dd7d440fa0c25425 (patch)
treefa0ee744088157a96f8a441a49b82da43a341e86
parentf83e4caeee5452d9ba23075b665287a872db6615 (diff)
downloadscintilla-mirror-0db2ee5ef1861fa6ead62e19dd7d440fa0c25425.tar.gz
Fix build problems with Mingw gcc 4.6.1.
The -mno-cygwin and --relocatable options are no longer supported.
-rw-r--r--win32/makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/makefile b/win32/makefile
index 7a7c43dc0..4b8ba397f 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -15,11 +15,11 @@ LEXLIB = Lexers.a
vpath %.h ../src ../include ../lexlib
vpath %.cxx ../src ../lexlib ../lexers
-LDFLAGS=-shared -static -Wl,--enable-runtime-pseudo-reloc-v2 -mno-cygwin -mwindows --relocatable -Wl,--add-stdcall-alias
+LDFLAGS=-shared -static -Wl,--enable-runtime-pseudo-reloc-v2 -mwindows -Wl,--add-stdcall-alias
LIBS=-lstdc++ -limm32 -lole32 -luuid
# Add -MMD to get dependencies
INCLUDEDIRS=-I ../include -I ../src -I../lexlib
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-strict-overflow -pedantic $(INCLUDEDIRS) -fno-rtti -mno-cygwin
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-strict-overflow -pedantic $(INCLUDEDIRS) -fno-rtti
ifdef DEBUG
CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)