From 4c63e1f574ac9eb0270df93059b3c87c47d3332f Mon Sep 17 00:00:00 2001 From: divverent Date: Fri, 9 Jan 2009 21:52:07 +0000 Subject: [PATCH] don't use else ifeq git-svn-id: svn://svn.icculus.org/netradiant/trunk@161 61c419a2-8eb2-4b30-bcec-8cead039b335 --- Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f9998682..32917392 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,7 @@ endif CPPFLAGS_COMMON += -D_DEBUG LDFLAGS_COMMON += else + ifeq ($(BUILD),profile) ifeq ($(findstring $(CFLAGS),-g),) CFLAGS_COMMON += -g @@ -125,8 +126,8 @@ endif CFLAGS_COMMON += -pg CPPFLAGS_COMMON += LDFLAGS_COMMON += -pg - else + ifeq ($(BUILD),release) ifeq ($(findstring $(CFLAGS),-O),) CFLAGS_COMMON += -O3 @@ -135,8 +136,8 @@ ifeq ($(findstring $(CFLAGS),-O),) endif CPPFLAGS_COMMON += LDFLAGS_COMMON += -s - else + $(error Unsupported build type: $(BUILD)) endif endif @@ -152,7 +153,9 @@ ifeq ($(OS),Linux) A = a DLL = so MWINDOWS = -else ifeq ($(OS),Win32) +else + +ifeq ($(OS),Win32) CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline CFLAGS_COMMON += -mms-bitfields LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias @@ -168,7 +171,9 @@ else ifeq ($(OS),Win32) LIBS_GL = -lopengl32 # workaround: no -ldl on Win32 LIBS_DL = -else ifeq ($(OS),Darwin) +else + +ifeq ($(OS),Darwin) CFLAGS_COMMON += -force-cpusubtype_ALL -fPIC CXXFLAGS_COMMON += -fno-exceptions -fno-rtti CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include @@ -177,8 +182,11 @@ else ifeq ($(OS),Darwin) EXE = ppc $(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch) else + $(error Unsupported build OS: $(OS)) endif +endif +endif # VERSION! RADIANT_VERSION = 1.5.0 -- 2.39.2