Updated stub and sample makefiles for CS:S and CS:GO (bug 5458, r=psychonic).
Updated stub and sample makefiles for CS:S and CS:GO (
bug 5458, r=psychonic).
1.1 --- a/sample_mm/Makefile Sat Aug 25 09:28:35 2012 -0500
1.2 +++ b/sample_mm/Makefile Sat Aug 25 09:29:14 2012 -0500
1.3 @@ -7,10 +7,12 @@
1.4
1.5 HL2SDK_ORIG = ../../hl2sdk
1.6 HL2SDK_OB = ../../hl2sdk-ob
1.7 +HL2SDK_CSS = ../../hl2sdk-css
1.8 HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
1.9 HL2SDK_L4D = ../../hl2sdk-l4d
1.10 HL2SDK_L4D2 = ../../hl2sdk-l4d2
1.11 -MMSOURCE18 = ..
1.12 +HL2SDK_CSGO = ../../hl2sdk-csgo
1.13 +MMSOURCE19 = ..
1.14
1.15 #####################################
1.16 ### EDIT BELOW FOR OTHER PROJECTS ###
1.17 @@ -23,10 +25,11 @@
1.18 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
1.19 ##############################################
1.20
1.21 -OPT_FLAGS = -O3 -funroll-loops -s -pipe
1.22 +OPT_FLAGS = -O3 -funroll-loops -pipe
1.23 GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden
1.24 DEBUG_FLAGS = -g -ggdb3 -D_DEBUG
1.25 CPP = gcc
1.26 +CPP_OSX = clang
1.27
1.28 ##########################
1.29 ### SDK CONFIGURATIONS ###
1.30 @@ -35,7 +38,7 @@
1.31 override ENGSET = false
1.32
1.33 # Check for valid list of engines
1.34 -ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE)))
1.35 +ifneq (,$(filter original orangebox orangeboxvalve css left4dead left4dead2 csgo,$(ENGINE)))
1.36 override ENGSET = true
1.37 endif
1.38
1.39 @@ -47,27 +50,35 @@
1.40 HL2SDK = $(HL2SDK_OB)
1.41 CFLAGS += -DSOURCE_ENGINE=3
1.42 endif
1.43 +ifeq "$(ENGINE)" "css"
1.44 + HL2SDK = $(HL2SDK_CSS)
1.45 + CFLAGS += -DSOURCE_ENGINE=6
1.46 +endif
1.47 ifeq "$(ENGINE)" "orangeboxvalve"
1.48 HL2SDK = $(HL2SDK_OB_VALVE)
1.49 - CFLAGS += -DSOURCE_ENGINE=4
1.50 + CFLAGS += -DSOURCE_ENGINE=7
1.51 endif
1.52 ifeq "$(ENGINE)" "left4dead"
1.53 HL2SDK = $(HL2SDK_L4D)
1.54 - CFLAGS += -DSOURCE_ENGINE=5
1.55 + CFLAGS += -DSOURCE_ENGINE=8
1.56 endif
1.57 ifeq "$(ENGINE)" "left4dead2"
1.58 HL2SDK = $(HL2SDK_L4D2)
1.59 - CFLAGS += -DSOURCE_ENGINE=6
1.60 + CFLAGS += -DSOURCE_ENGINE=9
1.61 +endif
1.62 +ifeq "$(ENGINE)" "csgo"
1.63 + HL2SDK = $(HL2SDK_CSGO)
1.64 + CFLAGS += -DSOURCE_ENGINE=12
1.65 endif
1.66
1.67 HL2PUB = $(HL2SDK)/public
1.68
1.69 ifeq "$(ENGINE)" "original"
1.70 INCLUDE += -I$(HL2SDK)/public/dlls
1.71 - METAMOD = $(MMSOURCE18)/core-legacy
1.72 + METAMOD = $(MMSOURCE19)/core-legacy
1.73 else
1.74 INCLUDE += -I$(HL2SDK)/public/game/server
1.75 - METAMOD = $(MMSOURCE18)/core
1.76 + METAMOD = $(MMSOURCE19)/core
1.77 endif
1.78
1.79 OS := $(shell uname -s)
1.80 @@ -92,11 +103,15 @@
1.81 LIB_SUFFIX = .$(LIB_EXT)
1.82 endif
1.83
1.84 -CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 \
1.85 - -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6 -DSE_ALIENSWARM=7
1.86 +CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
1.87 + -DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
1.88 + -DSE_PORTAL2=11 -DSE_CSGO=12
1.89
1.90 -LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \
1.91 - -static-libgcc
1.92 +LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
1.93 +
1.94 +ifeq "$(ENGINE)" "csgo"
1.95 + LINK += $(HL2LIB)/interfaces_i486.a
1.96 +endif
1.97
1.98 INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
1.99 -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -I$(METAMOD) -I$(METAMOD)/sourcehook
1.100 @@ -115,11 +130,10 @@
1.101 CFLAGS += $(OPT_FLAGS)
1.102 endif
1.103
1.104 -GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
1.105 -
1.106 ifeq "$(OS)" "Darwin"
1.107 + CPP = $(CPP_OSX)
1.108 LIB_EXT = dylib
1.109 - CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk
1.110 + CFLAGS += -DOSX -D_OSX
1.111 LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
1.112 else
1.113 LIB_EXT = so
1.114 @@ -127,13 +141,34 @@
1.115 LINK += -shared
1.116 endif
1.117
1.118 -CFLAGS += -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
1.119 +IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
1.120 +
1.121 +ifeq "$(IS_CLANG)" "1"
1.122 + CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/")
1.123 + CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/")
1.124 +else
1.125 + CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1)
1.126 + CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3)
1.127 +endif
1.128 +
1.129 +CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
1.130 -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
1.131 - -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions \
1.132 - -fno-rtti -msse -m32 -fno-strict-aliasing
1.133 + -Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Wno-non-virtual-dtor -Wno-overloaded-virtual \
1.134 + -Werror -fPIC -fno-exceptions -fno-rtti -msse -m32 -fno-strict-aliasing
1.135 +
1.136 +# Clang || GCC >= 4
1.137 +ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
1.138 + CFLAGS += $(GCC4_FLAGS)
1.139 +endif
1.140
1.141 -ifeq "$(GCC_VERSION)" "4"
1.142 - CFLAGS += $(GCC4_FLAGS)
1.143 +# Clang >= 3 || GCC >= 4.7
1.144 +ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
1.145 + CFLAGS += -Wno-delete-non-virtual-dtor
1.146 +endif
1.147 +
1.148 +# OS is Linux and not using clang
1.149 +ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1"
1.150 + LINK += -static-libgcc
1.151 endif
1.152
1.153 OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
1.154 @@ -150,7 +185,7 @@
1.155 check:
1.156 if [ "$(ENGSET)" = "false" ]; then \
1.157 echo "You must supply one of the following values for ENGINE:"; \
1.158 - echo "left4dead2, left4dead, orangeboxvalve, orangebox, or original"; \
1.159 + echo "csgo, left4dead2, left4dead, css, orangeboxvalve, orangebox, or original"; \
1.160 exit 1; \
1.161 fi
1.162
2.1 --- a/stub_mm/Makefile Sat Aug 25 09:28:35 2012 -0500
2.2 +++ b/stub_mm/Makefile Sat Aug 25 09:29:14 2012 -0500
2.3 @@ -7,10 +7,12 @@
2.4
2.5 HL2SDK_ORIG = ../../hl2sdk
2.6 HL2SDK_OB = ../../hl2sdk-ob
2.7 +HL2SDK_CSS = ../../hl2sdk-css
2.8 HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
2.9 HL2SDK_L4D = ../../hl2sdk-l4d
2.10 HL2SDK_L4D2 = ../../hl2sdk-l4d2
2.11 -MMSOURCE18 = ..
2.12 +HL2SDK_CSGO = ../../hl2sdk-csgo
2.13 +MMSOURCE19 = ..
2.14
2.15 #####################################
2.16 ### EDIT BELOW FOR OTHER PROJECTS ###
2.17 @@ -23,10 +25,11 @@
2.18 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
2.19 ##############################################
2.20
2.21 -OPT_FLAGS = -O3 -funroll-loops -s -pipe
2.22 +OPT_FLAGS = -O3 -funroll-loops -pipe
2.23 GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden
2.24 DEBUG_FLAGS = -g -ggdb3 -D_DEBUG
2.25 CPP = gcc
2.26 +CPP_OSX = clang
2.27
2.28 ##########################
2.29 ### SDK CONFIGURATIONS ###
2.30 @@ -35,7 +38,7 @@
2.31 override ENGSET = false
2.32
2.33 # Check for valid list of engines
2.34 -ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE)))
2.35 +ifneq (,$(filter original orangebox orangeboxvalve css left4dead left4dead2 csgo,$(ENGINE)))
2.36 override ENGSET = true
2.37 endif
2.38
2.39 @@ -47,27 +50,35 @@
2.40 HL2SDK = $(HL2SDK_OB)
2.41 CFLAGS += -DSOURCE_ENGINE=3
2.42 endif
2.43 +ifeq "$(ENGINE)" "css"
2.44 + HL2SDK = $(HL2SDK_CSS)
2.45 + CFLAGS += -DSOURCE_ENGINE=6
2.46 +endif
2.47 ifeq "$(ENGINE)" "orangeboxvalve"
2.48 HL2SDK = $(HL2SDK_OB_VALVE)
2.49 - CFLAGS += -DSOURCE_ENGINE=4
2.50 + CFLAGS += -DSOURCE_ENGINE=7
2.51 endif
2.52 ifeq "$(ENGINE)" "left4dead"
2.53 HL2SDK = $(HL2SDK_L4D)
2.54 - CFLAGS += -DSOURCE_ENGINE=5
2.55 + CFLAGS += -DSOURCE_ENGINE=8
2.56 endif
2.57 ifeq "$(ENGINE)" "left4dead2"
2.58 HL2SDK = $(HL2SDK_L4D2)
2.59 - CFLAGS += -DSOURCE_ENGINE=6
2.60 + CFLAGS += -DSOURCE_ENGINE=9
2.61 +endif
2.62 +ifeq "$(ENGINE)" "csgo"
2.63 + HL2SDK = $(HL2SDK_CSGO)
2.64 + CFLAGS += -DSOURCE_ENGINE=12
2.65 endif
2.66
2.67 HL2PUB = $(HL2SDK)/public
2.68
2.69 ifeq "$(ENGINE)" "original"
2.70 INCLUDE += -I$(HL2SDK)/public/dlls
2.71 - METAMOD = $(MMSOURCE18)/core-legacy
2.72 + METAMOD = $(MMSOURCE19)/core-legacy
2.73 else
2.74 INCLUDE += -I$(HL2SDK)/public/game/server
2.75 - METAMOD = $(MMSOURCE18)/core
2.76 + METAMOD = $(MMSOURCE19)/core
2.77 endif
2.78
2.79 OS := $(shell uname -s)
2.80 @@ -92,11 +103,15 @@
2.81 LIB_SUFFIX = .$(LIB_EXT)
2.82 endif
2.83
2.84 -CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 \
2.85 - -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6 -DSE_ALIENSWARM=7
2.86 +CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
2.87 + -DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
2.88 + -DSE_PORTAL2=11 -DSE_CSGO=12
2.89
2.90 -LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \
2.91 - -static-libgcc
2.92 +LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
2.93 +
2.94 +ifeq "$(ENGINE)" "csgo"
2.95 + LINK += $(HL2LIB)/interfaces_i486.a
2.96 +endif
2.97
2.98 INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
2.99 -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -I$(METAMOD) -I$(METAMOD)/sourcehook
2.100 @@ -115,11 +130,11 @@
2.101 CFLAGS += $(OPT_FLAGS)
2.102 endif
2.103
2.104 -GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
2.105
2.106 ifeq "$(OS)" "Darwin"
2.107 + CPP = $(CPP_OSX)
2.108 LIB_EXT = dylib
2.109 - CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk
2.110 + CFLAGS += -DOSX -D_OSX
2.111 LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
2.112 else
2.113 LIB_EXT = so
2.114 @@ -127,13 +142,34 @@
2.115 LINK += -shared
2.116 endif
2.117
2.118 -CFLAGS += -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
2.119 +IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
2.120 +
2.121 +ifeq "$(IS_CLANG)" "1"
2.122 + CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/")
2.123 + CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/")
2.124 +else
2.125 + CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1)
2.126 + CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3)
2.127 +endif
2.128 +
2.129 +CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
2.130 -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
2.131 - -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions \
2.132 - -fno-rtti -msse -m32 -fno-strict-aliasing
2.133 + -Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Wno-non-virtual-dtor -Wno-overloaded-virtual \
2.134 + -Werror -fPIC -fno-exceptions -fno-rtti -msse -m32 -fno-strict-aliasing
2.135 +
2.136 +# Clang || GCC >= 4
2.137 +ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
2.138 + CFLAGS += $(GCC4_FLAGS)
2.139 +endif
2.140
2.141 -ifeq "$(GCC_VERSION)" "4"
2.142 - CFLAGS += $(GCC4_FLAGS)
2.143 +# Clang >= 3 || GCC >= 4.7
2.144 +ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
2.145 + CFLAGS += -Wno-delete-non-virtual-dtor
2.146 +endif
2.147 +
2.148 +# OS is Linux and not using clang
2.149 +ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1"
2.150 + LINK += -static-libgcc
2.151 endif
2.152
2.153 OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
2.154 @@ -150,7 +186,7 @@
2.155 check:
2.156 if [ "$(ENGSET)" = "false" ]; then \
2.157 echo "You must supply one of the following values for ENGINE:"; \
2.158 - echo "left4dead2, left4dead, orangeboxvalve, orangebox, or original"; \
2.159 + echo "csgo, left4dead2, left4dead, css, orangeboxvalve, orangebox, or original"; \
2.160 exit 1; \
2.161 fi
2.162