SourceMod can now be somewhat compiled on OS X for patch sanity testing (bug 3516, r=ds).

This adds the ability for us to change the GCC version we use more flexibly.

core/CDataPack.cpp

@@ -29,7 +29,7 @@
  * Version: $Id$
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "CDataPack.h"
 

core/CellArray.h

@@ -29,7 +29,7 @@
  * Version: $Id$
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 extern HandleType_t htCellArray;

core/CoreConfig.cpp

@@ -44,7 +44,7 @@
 
 #ifdef PLATFORM_WINDOWS
 ConVar sm_corecfgfile("sm_corecfgfile", "addons\\sourcemod\\configs\\core.cfg", 0, "SourceMod core configuration file");
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE
 ConVar sm_corecfgfile("sm_corecfgfile", "addons/sourcemod/configs/core.cfg", 0, "SourceMod core configuration file");
 #endif
 
@@ -275,7 +275,7 @@ inline bool IsPathSepChar(char c)
 {
 #if defined PLATFORM_WINDOWS
 	return (c == '\\' || c == '/');
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_LINUX || defined PLATFORM_POSIX
 	return (c == '/');
 #endif
 }

core/GameConfigs.cpp

@@ -73,6 +73,9 @@ char g_GameName[256] = {'$', '\0'};
 #elif defined PLATFORM_LINUX
 #define PLATFORM_NAME				"linux"
 #define PLATFORM_SERVER_BINARY		"server_i486.so"
+#elif defined PLATFORM_APPLE
+#define PLATFORM_NAME               "undef"
+#define PLATFORM_SERVER_BINARY      "undef.dylib"
 #endif
 
 struct TempSigInfo

core/LibrarySys.cpp

@@ -138,7 +138,7 @@ bool CDirectory::IsEntryDirectory()
 {
 #if defined PLATFORM_WINDOWS
 	return ((m_fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_POSIX
 	char temppath[PLATFORM_MAX_PATH];
 	snprintf(temppath, sizeof(temppath), "%s/%s", m_origpath, GetEntryName());
 	return g_LibSys.IsPathDirectory(temppath);
@@ -160,7 +160,7 @@ const char *CDirectory::GetEntryName()
 {
 #if defined PLATFORM_WINDOWS
 	return m_fd.cFileName;
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_POSIX
 	return ep ? ep->d_name : "";
 #endif
 }
@@ -174,7 +174,7 @@ bool CDirectory::IsValid()
 {
 #if defined PLATFORM_WINDOWS
 	return (m_dir != INVALID_HANDLE_VALUE);
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_POSIX
 	return (m_dir != NULL);
 #endif
 }
@@ -214,7 +214,7 @@ bool LibrarySystem::IsPathFile(const char *path)
 	}
 
 	return true;
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_POSIX
 	struct stat s;
 
 	if (stat(path, &s) != 0)

core/Makefile

@@ -43,7 +43,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"

core/md5.cpp

@@ -201,11 +201,7 @@ char *MD5::hex_digest(){
   int i;
   char *s= new char[33];
 
-  if (!finalized){
-/*    cerr << "MD5::hex_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;*/
-    return "";
-  }
+  assert(finalized);
 
   for (i=0; i<16; i++)
     sprintf(s+i*2, "%02x", digest[i]);
@@ -220,12 +216,7 @@ char *MD5::hex_digest(char buffer[33]){
 
   int i;
 
-  if (!finalized)
-  {
-	 /* cerr << "MD5::hex_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;*/
-    return "";
-  }
+  assert(finalized);
 
   for (i=0; i<16; i++)
     sprintf(buffer+i*2, "%02x", digest[i]);

core/sm_memtable.cpp

@@ -30,7 +30,7 @@
  */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "sm_memtable.h"
 
 BaseMemTable::BaseMemTable(unsigned int init_size)

core/sm_queue.h

@@ -33,7 +33,7 @@
 #define _INCLUDE_SM_QUEUE_H
 
 #include <new>
-#include <malloc.h>
+#include <stdlib.h>
 #include <sh_stack.h>
 
 using namespace SourceHook;

core/smn_adt_array.cpp

@@ -29,7 +29,7 @@
  * Version: $Id$
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "sm_globals.h"
 #include "sm_stringutil.h"
 #include "CellArray.h"

core/smn_adt_stack.cpp

@@ -29,7 +29,7 @@
 * Version: $Id$
 */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "sm_globals.h"
 #include "sm_stringutil.h"
 #include "CellArray.h"

core/smn_adt_trie.cpp

@@ -29,7 +29,7 @@
  * Version: $Id$
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "sm_globals.h"
 #include "sm_stringutil.h"
 #include "HandleSys.h"

core/smn_core.cpp

@@ -418,6 +418,9 @@ static cell_t GetSysTickCount(IPluginContext *pContext, const cell_t *params)
 		fticks -= r;
 	}
 	return (cell_t)fticks;
+#elif defined PLATFORM_APPLE
+	assert(false);
+	return 0;
 #endif
 }
 

core/smn_string.cpp

@@ -40,7 +40,7 @@ inline const char *_strstr(const char *str, const char *substr)
 {
 #ifdef PLATFORM_WINDOWS
 	return strstr(str, substr);
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE
 	return (const char *)strstr(str, substr);
 #endif
 }