diff -r 5aae9d3eaed5 -r 932a55286baa sample_mm/Makefile --- a/sample_mm/Makefile Sat Aug 25 09:28:35 2012 -0500 +++ b/sample_mm/Makefile Sat Aug 25 09:29:14 2012 -0500 @@ -7,10 +7,12 @@ HL2SDK_ORIG = ../../hl2sdk HL2SDK_OB = ../../hl2sdk-ob +HL2SDK_CSS = ../../hl2sdk-css HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve HL2SDK_L4D = ../../hl2sdk-l4d HL2SDK_L4D2 = ../../hl2sdk-l4d2 -MMSOURCE18 = .. +HL2SDK_CSGO = ../../hl2sdk-csgo +MMSOURCE19 = .. ##################################### ### EDIT BELOW FOR OTHER PROJECTS ### @@ -23,10 +25,11 @@ ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ### ############################################## -OPT_FLAGS = -O3 -funroll-loops -s -pipe +OPT_FLAGS = -O3 -funroll-loops -pipe GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden DEBUG_FLAGS = -g -ggdb3 -D_DEBUG CPP = gcc +CPP_OSX = clang ########################## ### SDK CONFIGURATIONS ### @@ -35,7 +38,7 @@ override ENGSET = false # Check for valid list of engines -ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE))) +ifneq (,$(filter original orangebox orangeboxvalve css left4dead left4dead2 csgo,$(ENGINE))) override ENGSET = true endif @@ -47,27 +50,35 @@ HL2SDK = $(HL2SDK_OB) CFLAGS += -DSOURCE_ENGINE=3 endif +ifeq "$(ENGINE)" "css" + HL2SDK = $(HL2SDK_CSS) + CFLAGS += -DSOURCE_ENGINE=6 +endif ifeq "$(ENGINE)" "orangeboxvalve" HL2SDK = $(HL2SDK_OB_VALVE) - CFLAGS += -DSOURCE_ENGINE=4 + CFLAGS += -DSOURCE_ENGINE=7 endif ifeq "$(ENGINE)" "left4dead" HL2SDK = $(HL2SDK_L4D) - CFLAGS += -DSOURCE_ENGINE=5 + CFLAGS += -DSOURCE_ENGINE=8 endif ifeq "$(ENGINE)" "left4dead2" HL2SDK = $(HL2SDK_L4D2) - CFLAGS += -DSOURCE_ENGINE=6 + CFLAGS += -DSOURCE_ENGINE=9 +endif +ifeq "$(ENGINE)" "csgo" + HL2SDK = $(HL2SDK_CSGO) + CFLAGS += -DSOURCE_ENGINE=12 endif HL2PUB = $(HL2SDK)/public ifeq "$(ENGINE)" "original" INCLUDE += -I$(HL2SDK)/public/dlls - METAMOD = $(MMSOURCE18)/core-legacy + METAMOD = $(MMSOURCE19)/core-legacy else INCLUDE += -I$(HL2SDK)/public/game/server - METAMOD = $(MMSOURCE18)/core + METAMOD = $(MMSOURCE19)/core endif OS := $(shell uname -s) @@ -92,11 +103,15 @@ LIB_SUFFIX = .$(LIB_EXT) endif -CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 \ - -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6 -DSE_ALIENSWARM=7 +CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \ + -DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \ + -DSE_PORTAL2=11 -DSE_CSGO=12 -LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \ - -static-libgcc +LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) + +ifeq "$(ENGINE)" "csgo" + LINK += $(HL2LIB)/interfaces_i486.a +endif INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \ -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -I$(METAMOD) -I$(METAMOD)/sourcehook @@ -115,11 +130,10 @@ CFLAGS += $(OPT_FLAGS) endif -GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) - ifeq "$(OS)" "Darwin" + CPP = $(CPP_OSX) LIB_EXT = dylib - CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk + CFLAGS += -DOSX -D_OSX LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5 else LIB_EXT = so @@ -127,13 +141,34 @@ LINK += -shared endif -CFLAGS += -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ +IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0") + +ifeq "$(IS_CLANG)" "1" + CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/") + CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/") +else + CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1) + CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3) +endif + +CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ - -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions \ - -fno-rtti -msse -m32 -fno-strict-aliasing + -Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Wno-non-virtual-dtor -Wno-overloaded-virtual \ + -Werror -fPIC -fno-exceptions -fno-rtti -msse -m32 -fno-strict-aliasing + +# Clang || GCC >= 4 +ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1" + CFLAGS += $(GCC4_FLAGS) +endif -ifeq "$(GCC_VERSION)" "4" - CFLAGS += $(GCC4_FLAGS) +# Clang >= 3 || GCC >= 4.7 +ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1" + CFLAGS += -Wno-delete-non-virtual-dtor +endif + +# OS is Linux and not using clang +ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1" + LINK += -static-libgcc endif OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) @@ -150,7 +185,7 @@ check: if [ "$(ENGSET)" = "false" ]; then \ echo "You must supply one of the following values for ENGINE:"; \ - echo "left4dead2, left4dead, orangeboxvalve, orangebox, or original"; \ + echo "csgo, left4dead2, left4dead, css, orangeboxvalve, orangebox, or original"; \ exit 1; \ fi