diff options
| author | nyamatongwe <unknown> | 2011-10-10 12:26:34 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-10-10 12:26:34 +1100 |
| commit | 9eb8b4cbb3e7d7a1e0961ee532109dbb97b7d71c (patch) | |
| tree | 47681ef3904eadb8e2d793dbaac75a6ddd6fd0e7 | |
| parent | 6789174f8bd1f796d718e728667d08c337d9149a (diff) | |
| download | scintilla-mirror-9eb8b4cbb3e7d7a1e0961ee532109dbb97b7d71c.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/makefile | 4 |
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) |