From c1fb0af729452c44df7457e8e0f9d0dde4e3aa2d Mon Sep 17 00:00:00 2001 From: Giel van Schijndel Date: Wed, 23 Jul 2008 13:48:50 +0000 Subject: [PATCH] * -mwindows is a linker flag, so move it from CFLAGS and CXXFLAGS to LDFLAGS * autorevision is a command line utility, not a GUI program, so strip the -mwindows flag from its linker flags git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5646 4a71c877-e1ca-e34f-864e-861f7616d084 --- build_tools/autorevision/makefile.win32 | 2 ++ makerules/configure.mk | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/autorevision/makefile.win32 b/build_tools/autorevision/makefile.win32 index 4afc64be3..3990880be 100644 --- a/build_tools/autorevision/makefile.win32 +++ b/build_tools/autorevision/makefile.win32 @@ -3,6 +3,8 @@ top_builddir=$(top_srcdir) include $(top_srcdir)/makerules/common.mk +LDFLAGS:=$(subst -mwindows,,$(LDFLAGS)) + SRC=autorevision.cpp EXE=autorevision diff --git a/makerules/configure.mk b/makerules/configure.mk index ebc307cd1..b70d60461 100644 --- a/makerules/configure.mk +++ b/makerules/configure.mk @@ -70,9 +70,7 @@ CC:=gcc CXX:=g++ WINDRES:=windres WZ_CPPFLAGS+=-DWIN32 -WZ_CFLAGS+=-mwindows -WZ_CXXFLAGS+=-mwindows -WZ_LDFLAGS+=-lmingw32 -lSDLmain -lSDL -lSDL_net -lpng12 -lphysfs -lz -lvorbisfile -lvorbis -logg -lpopt -lintl -lGLC -lglu32 -lopengl32 -lopenal32 -ldbghelp -lshfolder -lwinmm -lwsock32 -lbfd -liberty -liconv -lz -lfreetype -lfontconfig -lexpat +WZ_LDFLAGS+=-mwindows -lmingw32 -lSDLmain -lSDL -lSDL_net -lpng12 -lphysfs -lz -lvorbisfile -lvorbis -logg -lpopt -lintl -lGLC -lglu32 -lopengl32 -lopenal32 -ldbghelp -lshfolder -lwinmm -lwsock32 -lbfd -liberty -liconv -lz -lfreetype -lfontconfig -lexpat # Import environment variables