Merge from sourcemod-1.1 branch.

public/mms_sample_ext/Makefile

@@ -24,7 +24,7 @@ C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
-CPP = gcc-4.1
+CPP = gcc
 
 override ENGSET = false
 ifeq "$(ENGINE)" "original"
@@ -60,7 +60,7 @@ endif
 
 CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
 
-LINK = vstdlib_i486.so tier0_i486.so -static-libgcc
+LINK = vstdlib_i486.so tier0_i486.so -m32 -ldl -lm
 
 INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
 	-I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK) -I$(SMSDK)/jit -I$(SMSDK)/jit/x86 \
@@ -83,14 +83,21 @@ else
 	CFLAGS += $(C_OPT_FLAGS)
 endif
 
+OS := $(shell uname -s)
+ifeq "$(OS)" "Darwin"
+	LINK += -dynamiclib
+	BINARY = $(PROJECT).dylib
+else
+	LINK += -static-libgcc -shared
+	BINARY = $(PROJECT)_i486.so
+endif
+
 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
 ifeq "$(GCC_VERSION)" "4"
 	CFLAGS += $(C_GCC4_FLAGS)
 	CPPFLAGS += $(CPP_GCC4_FLAGS)
 endif
 
-BINARY = $(PROJECT)_i486.so
-
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
 $(BIN_DIR)/%.o: %.cpp
@@ -109,7 +116,7 @@ check:
 	fi
 
 mms_ext: check $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
+	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -o $(BIN_DIR)/$(BINARY)
 
 debug:
 	$(MAKE) -f Makefile all DEBUG=true

public/sample_ext/Makefile

@@ -27,7 +27,7 @@ C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
-CPP = gcc-4.1
+CPP = gcc
 
 override ENGSET = false
 ifeq "$(ENGINE)" "original"
@@ -73,7 +73,7 @@ else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 endif
 
-LINK += -static-libgcc
+LINK += -m32 -lm -ldl
 
 CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
 	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -Wno-switch \
@@ -96,14 +96,21 @@ ifeq "$(USEMETA)" "true"
 	BIN_DIR := $(BIN_DIR).$(ENGINE)
 endif
 
+OS := $(shell uname -s)
+ifeq "$(OS)" "Darwin"
+	LINK += -dynamiclib
+	BINARY = $(PROJECT).ext.dylib
+else
+	LINK += -static-libgcc -shared
+	BINARY = $(PROJECT).ext.so
+endif
+
 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
 ifeq "$(GCC_VERSION)" "4"
 	CFLAGS += $(C_GCC4_FLAGS)
 	CPPFLAGS += $(CPP_GCC4_FLAGS)
 endif
 
-BINARY = $(PROJECT).ext.so
-
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
 $(BIN_DIR)/%.o: %.cpp
@@ -124,7 +131,7 @@ check:
 	fi
 
 extension: check $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
+	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -o $(BIN_DIR)/$(BINARY)
 
 debug:
 	$(MAKE) -f Makefile all DEBUG=true

public/sample_ext/sdk/smsdk_ext.cpp

@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "smsdk_ext.h"
 
 /**
@@ -434,7 +434,7 @@ bool SDKExtension::SDK_OnMetamodPauseChange(bool paused, char *error, size_t max
 #endif
 
 /* Overload a few things to prevent libstdc++ linking */
-#if defined __linux__
+#if defined __linux__ || defined __APPLE__
 extern "C" void __cxa_pure_virtual(void)
 {
 }
@@ -459,3 +459,4 @@ void operator delete[](void * ptr)
 	free(ptr);
 }
 #endif
+

public/sm_platform.h

@@ -60,15 +60,23 @@
 #if defined _MSC_VER && _MSC_VER >= 1400
 #define SUBPLATFORM_SECURECRT
 #endif
-#elif defined __linux__
-#define PLATFORM_LINUX
+#elif defined __linux__ || defined __APPLE__
+#if defined __linux__
+# define PLATFORM_LINUX
+# define PLATFORM_LIB_EXT		"so"
+#elif defined __APPLE__
+# define PLATFORM_APPLE
+# define PLATFORM_LIB_EXT		"dylib"
+#endif
 #define PLATFORM_POSIX
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <dlfcn.h>
 #include <sys/stat.h>
-#define PLATFORM_LIB_EXT		"so"
+#if defined PLATFORM_APPLE
+#include <sys/syslimits.h>
+#endif
 #define PLATFORM_MAX_PATH		PATH_MAX
 #define PLATFORM_SEP_CHAR		'/'
 #define PLATFORM_SEP_ALTCHAR	'\\'
@@ -80,3 +88,4 @@
 #endif
 
 #endif //_INCLUDE_SOURCEMOD_PLATFORM_H_
+

public/sm_trie_tpl.h

@@ -34,7 +34,7 @@
 
 #include <new>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <assert.h>
 
 enum NodeType

public/sourcepawn/sp_file_headers.h

@@ -60,7 +60,7 @@
 #define SPFILE_VERSION	0x0102			/**< File format version */
 
 //:TODO: better compiler/nix support
-#if defined __linux__
+#if defined __GNUC__
 	#pragma pack(1)         /* structures must be packed (byte-aligned) */
 #else
 	#pragma pack(push)