From 9eb8b4cbb3e7d7a1e0961ee532109dbb97b7d71c Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Mon, 10 Oct 2011 12:26:34 +1100
Subject: Fix build problems with Mingw gcc 4.6.1. The -mno-cygwin and
 --relocatable options are no longer supported.

---
 win32/makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32')

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)
-- 
cgit v1.2.3