quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix OS detection for native mingw32/MSYS

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@53 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-16 06:19:38 +00:00
parent a40b5492d8
commit 4d37af3c00
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -1,5 +1,9 @@
include Makefile.conf include Makefile.conf
ifeq ($(OS),MINGW32_NT-6.0)
OS = Win32
endif
CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter
CPPFLAGS = CPPFLAGS =
LDFLAGS = LDFLAGS =
@ -15,8 +19,8 @@ ifneq ($(MINGW),)
AR = $(MINGWPREFIX)ar AR = $(MINGWPREFIX)ar
OS := Win32 OS := Win32
CPPFLAGS += -I$(MINGW)/include -D_inline=inline CPPFLAGS += -I$(MINGW)/include -D_inline=inline
CFLAGS += -mms-bitfields CFLAGS +=
LDFLAGS += -mms-bitfields -L$(MINGW)/lib LDFLAGS += -L$(MINGW)/lib
CPPFLAGS_GLIB = -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include CPPFLAGS_GLIB = -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include
LIBS_GLIB = -lglib-2.0 LIBS_GLIB = -lglib-2.0
@ -55,17 +59,16 @@ ifeq ($(OS),Linux)
MWINDOWS = MWINDOWS =
else ifeq ($(OS),Win32) else ifeq ($(OS),Win32)
CPPFLAGS += -DWIN32 -D_WIN32 CPPFLAGS += -DWIN32 -D_WIN32
CFLAGS += CFLAGS += -mms-bitfields
LDFLAGS_DLL = LDFLAGS_DLL =
LIBS = -lws2_32 -luser32 -lgdi32 LIBS = -lws2_32 -luser32 -lgdi32
EXE = exe EXE = exe
A = a A = a
DLL = dll DLL = dll
MWINDOWS = -mwindows MWINDOWS = -mwindows
else ifeq ($(OS),Darwin) #else ifeq ($(OS),Darwin)
$(error Unsupported build OS)
else else
$(error Unsupported build OS) $(error Unsupported build OS: $(OS))
endif endif
CPPFLAGS_GLIB ?= `pkg-config glib-2.0 --cflags` CPPFLAGS_GLIB ?= `pkg-config glib-2.0 --cflags`