Added Mac OS X build support to stub/sample plugin makefiles (bug 4391, r=dvander).
Added Mac OS X build support to stub/sample plugin makefiles (
bug 4391, r=dvander).
1.1 --- a/sample_mm/Makefile Wed May 19 04:14:49 2010 -0500
1.2 +++ b/sample_mm/Makefile Sat May 22 00:45:44 2010 -0500
1.3 @@ -11,14 +11,13 @@
1.4 HL2SDK_L4D = ../../hl2sdk-l4d
1.5 HL2SDK_L4D2 = ../../hl2sdk-l4d2
1.6 MMSOURCE18 = ..
1.7 -SRCDS_BASE = ~/srcds
1.8
1.9 #####################################
1.10 ### EDIT BELOW FOR OTHER PROJECTS ###
1.11 #####################################
1.12
1.13 +PROJECT = sample_mm
1.14 OBJECTS = sample_mm.cpp
1.15 -BINARY = sample_mm_i486.so
1.16
1.17 ##############################################
1.18 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
1.19 @@ -27,65 +26,70 @@
1.20 OPT_FLAGS = -O3 -funroll-loops -s -pipe
1.21 GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden
1.22 DEBUG_FLAGS = -g -ggdb3 -D_DEBUG
1.23 -CPP = gcc-4.1
1.24 +CPP = gcc
1.25 +
1.26 +##########################
1.27 +### SDK CONFIGURATIONS ###
1.28 +##########################
1.29
1.30 override ENGSET = false
1.31 +
1.32 +# Check for valid list of engines
1.33 +ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE)))
1.34 + override ENGSET = true
1.35 +endif
1.36 +
1.37 ifeq "$(ENGINE)" "original"
1.38 HL2SDK = $(HL2SDK_ORIG)
1.39 - HL2PUB = $(HL2SDK)/public
1.40 - HL2LIB = $(HL2SDK)/linux_sdk
1.41 CFLAGS += -DSOURCE_ENGINE=1
1.42 - METAMOD = $(MMSOURCE18)/core-legacy
1.43 - INCLUDE += -I$(HL2SDK)/public/dlls
1.44 - SRCDS = $(SRCDS_BASE)
1.45 - LIB_SUFFIX = _i486.so
1.46 - override ENGSET = true
1.47 endif
1.48 ifeq "$(ENGINE)" "orangebox"
1.49 HL2SDK = $(HL2SDK_OB)
1.50 - HL2PUB = $(HL2SDK)/public
1.51 - HL2LIB = $(HL2SDK)/lib/linux
1.52 CFLAGS += -DSOURCE_ENGINE=3
1.53 - METAMOD = $(MMSOURCE18)/core
1.54 - INCLUDE += -I$(HL2SDK)/public/game/server
1.55 - SRCDS = $(SRCDS_BASE)/orangebox
1.56 - LIB_SUFFIX = _i486.so
1.57 - override ENGSET = true
1.58 endif
1.59 ifeq "$(ENGINE)" "orangeboxvalve"
1.60 HL2SDK = $(HL2SDK_OB_VALVE)
1.61 - HL2PUB = $(HL2SDK)/public
1.62 - HL2LIB = $(HL2SDK)/lib/linux
1.63 CFLAGS += -DSOURCE_ENGINE=4
1.64 - METAMOD = $(MMSOURCE18)/core
1.65 - INCLUDE += -I$(HL2SDK)/public/game/server
1.66 - SRCDS = $(SRCDS_BASE)/orangebox
1.67 - LIB_PREFIX = lib
1.68 - LIB_SUFFIX = .so
1.69 - override ENGSET = true
1.70 endif
1.71 ifeq "$(ENGINE)" "left4dead"
1.72 HL2SDK = $(HL2SDK_L4D)
1.73 - HL2PUB = $(HL2SDK)/public
1.74 - HL2LIB = $(HL2SDK)/lib/linux
1.75 CFLAGS += -DSOURCE_ENGINE=5
1.76 - METAMOD = $(MMSOURCE18)/core
1.77 - INCLUDE += -I$(HL2SDK)/public/game/server
1.78 - SRCDS = $(SRCDS_BASE)/l4d
1.79 - LIB_SUFFIX = _i486.so
1.80 - override ENGSET = true
1.81 endif
1.82 ifeq "$(ENGINE)" "left4dead2"
1.83 HL2SDK = $(HL2SDK_L4D2)
1.84 - HL2PUB = $(HL2SDK)/public
1.85 - HL2LIB = $(HL2SDK)/lib/linux
1.86 - CFLAGS += -DSOURCE_ENGINE=5
1.87 - METAMOD = $(MMSOURCE18)/core
1.88 + CFLAGS += -DSOURCE_ENGINE=6
1.89 +endif
1.90 +
1.91 +HL2PUB = $(HL2SDK)/public
1.92 +
1.93 +ifeq "$(ENGINE)" "original"
1.94 + INCLUDE += -I$(HL2SDK)/public/dlls
1.95 + METAMOD = $(MMSOURCE18)/core-legacy
1.96 +else
1.97 INCLUDE += -I$(HL2SDK)/public/game/server
1.98 - SRCDS = $(SRCDS_BASE)/left4dead2
1.99 + METAMOD = $(MMSOURCE18)/core
1.100 +endif
1.101 +
1.102 +OS := $(shell uname -s)
1.103 +
1.104 +ifeq "$(OS)" "Darwin"
1.105 + LIB_EXT = dylib
1.106 + HL2LIB = $(HL2SDK)/lib/mac
1.107 +else
1.108 + LIB_EXT = so
1.109 + ifeq "$(ENGINE)" "original"
1.110 + HL2LIB = $(HL2SDK)/linux_sdk
1.111 + else
1.112 + HL2LIB = $(HL2SDK)/lib/linux
1.113 + endif
1.114 +endif
1.115 +
1.116 +# if ENGINE is orig, OB, or L4D
1.117 +ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
1.118 + LIB_SUFFIX = _i486.$(LIB_EXT)
1.119 +else
1.120 LIB_PREFIX = lib
1.121 - LIB_SUFFIX = .so
1.122 - override ENGSET = true
1.123 + LIB_SUFFIX = .$(LIB_EXT)
1.124 endif
1.125
1.126 CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 \
1.127 @@ -96,11 +100,13 @@
1.128
1.129 INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
1.130 -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -I$(METAMOD) -I$(METAMOD)/sourcehook
1.131 -
1.132 +
1.133 ################################################
1.134 ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
1.135 ################################################
1.136
1.137 +BINARY = $(PROJECT).$(LIB_EXT)
1.138 +
1.139 ifeq "$(DEBUG)" "true"
1.140 BIN_DIR = Debug.$(ENGINE)
1.141 CFLAGS += $(DEBUG_FLAGS)
1.142 @@ -111,7 +117,17 @@
1.143
1.144 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
1.145
1.146 -CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
1.147 +ifeq "$(OS)" "Darwin"
1.148 + LIB_EXT = dylib
1.149 + CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk
1.150 + LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
1.151 +else
1.152 + LIB_EXT = so
1.153 + CFLAGS += -D_LINUX
1.154 + LINK += -shared
1.155 +endif
1.156 +
1.157 +CFLAGS += -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
1.158 -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
1.159 -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions \
1.160 -fno-rtti -msse -m32 -fno-strict-aliasing
1.161 @@ -120,7 +136,7 @@
1.162 CFLAGS += $(GCC4_FLAGS)
1.163 endif
1.164
1.165 -OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
1.166 +OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
1.167
1.168 $(BIN_DIR)/%.o: %.cpp
1.169 $(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
1.170 @@ -138,8 +154,8 @@
1.171 exit 1; \
1.172 fi
1.173
1.174 -sample_mm: check $(OBJ_LINUX)
1.175 - $(CPP) $(INCLUDE) -m32 $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
1.176 +sample_mm: check $(OBJ_BIN)
1.177 + $(CPP) $(INCLUDE) -m32 $(OBJ_BIN) $(LINK) -ldl -lm -o $(BIN_DIR)/$(BINARY)
1.178
1.179 default: all
1.180
2.1 --- a/stub_mm/Makefile Wed May 19 04:14:49 2010 -0500
2.2 +++ b/stub_mm/Makefile Sat May 22 00:45:44 2010 -0500
2.3 @@ -11,14 +11,13 @@
2.4 HL2SDK_L4D = ../../hl2sdk-l4d
2.5 HL2SDK_L4D2 = ../../hl2sdk-l4d2
2.6 MMSOURCE18 = ..
2.7 -SRCDS_BASE = ~/srcds
2.8
2.9 #####################################
2.10 ### EDIT BELOW FOR OTHER PROJECTS ###
2.11 #####################################
2.12
2.13 +PROJECT = stub_mm
2.14 OBJECTS = stub_mm.cpp
2.15 -BINARY = stub_mm_i486.so
2.16
2.17 ##############################################
2.18 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
2.19 @@ -27,65 +26,70 @@
2.20 OPT_FLAGS = -O3 -funroll-loops -s -pipe
2.21 GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden
2.22 DEBUG_FLAGS = -g -ggdb3 -D_DEBUG
2.23 -CPP = gcc-4.1
2.24 +CPP = gcc
2.25 +
2.26 +##########################
2.27 +### SDK CONFIGURATIONS ###
2.28 +##########################
2.29
2.30 override ENGSET = false
2.31 +
2.32 +# Check for valid list of engines
2.33 +ifneq (,$(filter original orangebox orangeboxvalve left4dead left4dead2,$(ENGINE)))
2.34 + override ENGSET = true
2.35 +endif
2.36 +
2.37 ifeq "$(ENGINE)" "original"
2.38 HL2SDK = $(HL2SDK_ORIG)
2.39 - HL2PUB = $(HL2SDK)/public
2.40 - HL2LIB = $(HL2SDK)/linux_sdk
2.41 CFLAGS += -DSOURCE_ENGINE=1
2.42 - METAMOD = $(MMSOURCE18)/core-legacy
2.43 - INCLUDE += -I$(HL2SDK)/public/dlls
2.44 - SRCDS = $(SRCDS_BASE)
2.45 - LIB_SUFFIX = _i486.so
2.46 - override ENGSET = true
2.47 endif
2.48 ifeq "$(ENGINE)" "orangebox"
2.49 HL2SDK = $(HL2SDK_OB)
2.50 - HL2PUB = $(HL2SDK)/public
2.51 - HL2LIB = $(HL2SDK)/lib/linux
2.52 CFLAGS += -DSOURCE_ENGINE=3
2.53 - METAMOD = $(MMSOURCE18)/core
2.54 - INCLUDE += -I$(HL2SDK)/public/game/server
2.55 - SRCDS = $(SRCDS_BASE)/orangebox
2.56 - LIB_SUFFIX = _i486.so
2.57 - override ENGSET = true
2.58 endif
2.59 ifeq "$(ENGINE)" "orangeboxvalve"
2.60 HL2SDK = $(HL2SDK_OB_VALVE)
2.61 - HL2PUB = $(HL2SDK)/public
2.62 - HL2LIB = $(HL2SDK)/lib/linux
2.63 CFLAGS += -DSOURCE_ENGINE=4
2.64 - METAMOD = $(MMSOURCE18)/core
2.65 - INCLUDE += -I$(HL2SDK)/public/game/server
2.66 - SRCDS = $(SRCDS_BASE)/orangebox
2.67 - LIB_PREFIX = lib
2.68 - LIB_SUFFIX = .so
2.69 - override ENGSET = true
2.70 endif
2.71 ifeq "$(ENGINE)" "left4dead"
2.72 HL2SDK = $(HL2SDK_L4D)
2.73 - HL2PUB = $(HL2SDK)/public
2.74 - HL2LIB = $(HL2SDK)/lib/linux
2.75 CFLAGS += -DSOURCE_ENGINE=5
2.76 - METAMOD = $(MMSOURCE18)/core
2.77 - INCLUDE += -I$(HL2SDK)/public/game/server
2.78 - SRCDS = $(SRCDS_BASE)/l4d
2.79 - LIB_SUFFIX = _i486.so
2.80 - override ENGSET = true
2.81 endif
2.82 ifeq "$(ENGINE)" "left4dead2"
2.83 HL2SDK = $(HL2SDK_L4D2)
2.84 - HL2PUB = $(HL2SDK)/public
2.85 - HL2LIB = $(HL2SDK)/lib/linux
2.86 CFLAGS += -DSOURCE_ENGINE=6
2.87 - METAMOD = $(MMSOURCE18)/core
2.88 +endif
2.89 +
2.90 +HL2PUB = $(HL2SDK)/public
2.91 +
2.92 +ifeq "$(ENGINE)" "original"
2.93 + INCLUDE += -I$(HL2SDK)/public/dlls
2.94 + METAMOD = $(MMSOURCE18)/core-legacy
2.95 +else
2.96 INCLUDE += -I$(HL2SDK)/public/game/server
2.97 - SRCDS = $(SRCDS_BASE)/left4dead2
2.98 + METAMOD = $(MMSOURCE18)/core
2.99 +endif
2.100 +
2.101 +OS := $(shell uname -s)
2.102 +
2.103 +ifeq "$(OS)" "Darwin"
2.104 + LIB_EXT = dylib
2.105 + HL2LIB = $(HL2SDK)/lib/mac
2.106 +else
2.107 + LIB_EXT = so
2.108 + ifeq "$(ENGINE)" "original"
2.109 + HL2LIB = $(HL2SDK)/linux_sdk
2.110 + else
2.111 + HL2LIB = $(HL2SDK)/lib/linux
2.112 + endif
2.113 +endif
2.114 +
2.115 +# if ENGINE is orig, OB, or L4D
2.116 +ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
2.117 + LIB_SUFFIX = _i486.$(LIB_EXT)
2.118 +else
2.119 LIB_PREFIX = lib
2.120 - LIB_SUFFIX = .so
2.121 - override ENGSET = true
2.122 + LIB_SUFFIX = .$(LIB_EXT)
2.123 endif
2.124
2.125 CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 \
2.126 @@ -101,6 +105,8 @@
2.127 ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
2.128 ################################################
2.129
2.130 +BINARY = $(PROJECT).$(LIB_EXT)
2.131 +
2.132 ifeq "$(DEBUG)" "true"
2.133 BIN_DIR = Debug.$(ENGINE)
2.134 CFLAGS += $(DEBUG_FLAGS)
2.135 @@ -111,7 +117,17 @@
2.136
2.137 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
2.138
2.139 -CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
2.140 +ifeq "$(OS)" "Darwin"
2.141 + LIB_EXT = dylib
2.142 + CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk
2.143 + LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
2.144 +else
2.145 + LIB_EXT = so
2.146 + CFLAGS += -D_LINUX
2.147 + LINK += -shared
2.148 +endif
2.149 +
2.150 +CFLAGS += -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
2.151 -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
2.152 -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions \
2.153 -fno-rtti -msse -m32 -fno-strict-aliasing
2.154 @@ -120,7 +136,7 @@
2.155 CFLAGS += $(GCC4_FLAGS)
2.156 endif
2.157
2.158 -OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
2.159 +OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
2.160
2.161 $(BIN_DIR)/%.o: %.cpp
2.162 $(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
2.163 @@ -138,8 +154,8 @@
2.164 exit 1; \
2.165 fi
2.166
2.167 -stub_mm: check $(OBJ_LINUX)
2.168 - $(CPP) $(INCLUDE) -m32 $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
2.169 +stub_mm: check $(OBJ_BIN)
2.170 + $(CPP) $(INCLUDE) -m32 $(OBJ_BIN) $(LINK) -ldl -lm -o $(BIN_DIR)/$(BINARY)
2.171
2.172 default: all
2.173