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

don't use else ifeq

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@161 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-01-09 21:52:07 +00:00
parent eb7125d282
commit 4c63e1f574
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -113,6 +113,7 @@ endif
CPPFLAGS_COMMON += -D_DEBUG CPPFLAGS_COMMON += -D_DEBUG
LDFLAGS_COMMON += LDFLAGS_COMMON +=
else else
ifeq ($(BUILD),profile) ifeq ($(BUILD),profile)
ifeq ($(findstring $(CFLAGS),-g),) ifeq ($(findstring $(CFLAGS),-g),)
CFLAGS_COMMON += -g CFLAGS_COMMON += -g
@ -125,8 +126,8 @@ endif
CFLAGS_COMMON += -pg CFLAGS_COMMON += -pg
CPPFLAGS_COMMON += CPPFLAGS_COMMON +=
LDFLAGS_COMMON += -pg LDFLAGS_COMMON += -pg
else else
ifeq ($(BUILD),release) ifeq ($(BUILD),release)
ifeq ($(findstring $(CFLAGS),-O),) ifeq ($(findstring $(CFLAGS),-O),)
CFLAGS_COMMON += -O3 CFLAGS_COMMON += -O3
@ -135,8 +136,8 @@ ifeq ($(findstring $(CFLAGS),-O),)
endif endif
CPPFLAGS_COMMON += CPPFLAGS_COMMON +=
LDFLAGS_COMMON += -s LDFLAGS_COMMON += -s
else else
$(error Unsupported build type: $(BUILD)) $(error Unsupported build type: $(BUILD))
endif endif
endif endif
@ -152,7 +153,9 @@ ifeq ($(OS),Linux)
A = a A = a
DLL = so DLL = so
MWINDOWS = MWINDOWS =
else ifeq ($(OS),Win32) else
ifeq ($(OS),Win32)
CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline
CFLAGS_COMMON += -mms-bitfields CFLAGS_COMMON += -mms-bitfields
LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
@ -168,7 +171,9 @@ else ifeq ($(OS),Win32)
LIBS_GL = -lopengl32 LIBS_GL = -lopengl32
# workaround: no -ldl on Win32 # workaround: no -ldl on Win32
LIBS_DL = LIBS_DL =
else ifeq ($(OS),Darwin) else
ifeq ($(OS),Darwin)
CFLAGS_COMMON += -force-cpusubtype_ALL -fPIC CFLAGS_COMMON += -force-cpusubtype_ALL -fPIC
CXXFLAGS_COMMON += -fno-exceptions -fno-rtti CXXFLAGS_COMMON += -fno-exceptions -fno-rtti
CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include
@ -177,8 +182,11 @@ else ifeq ($(OS),Darwin)
EXE = ppc EXE = ppc
$(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch) $(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch)
else else
$(error Unsupported build OS: $(OS)) $(error Unsupported build OS: $(OS))
endif endif
endif
endif
# VERSION! # VERSION!
RADIANT_VERSION = 1.5.0 RADIANT_VERSION = 1.5.0