Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only add the STATICLIB & _WIN32_WINNT defines for mingw builds 

I would like to thank autohell for this commit.
master
Buginator 2011-04-25 20:51:51 -04:00
parent 1c9bdd6f1b
commit fa91ccebb4
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/netplay/Makefile.am
View File

@ -1,8 +1,14 @@
SUBDIRS = miniupnpc
AM_CPPFLAGS = -DSTATICLIB $(WZ_CPPFLAGS) $(QT4_CFLAGS)
AM_CFLAGS = -DSTATICLIB $(WZ_CFLAGS)
AM_CXXFLAGS = -DSTATICLIB $(WZ_CXXFLAGS) $(QT4_CFLAGS)
if MINGW32
WZ_CPPFLAGS="${WZ_CPPFLAGS} -D_WIN32_WINNT=0x0501 -DSTATICLIB"
WZ_CPPFLAGS="$(WZ_CFLAGS) -D_WIN32_WINNT=0x0501 -DSTATICLIB"
WZ_CPPFLAGS="${WZ_CXXFLAGS} -D_WIN32_WINNT=0x0501 -DSTATICLIB"
endif
AM_CPPFLAGS = $(WZ_CPPFLAGS) $(QT4_CFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
noinst_LIBRARIES = libnetplay.a
noinst_HEADERS = \

10
lib/netplay/miniupnpc/Makefile.am
View File

@ -1,5 +1,11 @@
AM_CPPFLAGS = -DSTATICLIB -D_WIN32_WINNT=0x0501 $(WZ_CPPFLAGS)
AM_CFLAGS = -DSTATICLIB -D_WIN32_WINNT=0x0501 $(WZ_CFLAGS) -fno-strict-aliasing -UDEBUG
if MINGW32
WZ_CPPFLAGS="${WZ_CPPFLAGS} -D_WIN32_WINNT=0x0501 -DSTATICLIB"
WZ_CPPFLAGS="$(WZ_CFLAGS) -D_WIN32_WINNT=0x0501 -DSTATICLIB"
WZ_CPPFLAGS="${WZ_CXXFLAGS} -D_WIN32_WINNT=0x0501 -DSTATICLIB"
endif
AM_CPPFLAGS = $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS) -fno-strict-aliasing -UDEBUG
noinst_LIBRARIES = libminiupnpc.a
noinst_HEADERS = \