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.
This commit is contained in:
@@ -60,19 +60,18 @@ namespace builder
|
||||
File.Delete(binpath);
|
||||
}
|
||||
|
||||
string makefile_args = "";
|
||||
string makefile_args = "CPP=gcc-4.1 ";
|
||||
|
||||
if (lib.build_mode == BuildMode.BuildMode_Episode1)
|
||||
{
|
||||
makefile_args = null;
|
||||
}
|
||||
else if (lib.build_mode == BuildMode.BuildMode_Episode2)
|
||||
{
|
||||
makefile_args = "ENGINE=\"orangebox\"";
|
||||
makefile_args += "ENGINE=\"orangebox\" ";
|
||||
}
|
||||
else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
|
||||
{
|
||||
makefile_args = "ENGINE=\"original\"";
|
||||
makefile_args += "ENGINE=\"original\" ";
|
||||
}
|
||||
|
||||
/* Clean the project first */
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
g++ -I../../core ../../core/sm_crc32.cpp main.cpp -ocrc32
|
||||
g++ -I../../core ../../core/sm_crc32.cpp main.cpp -o crc32
|
||||
|
||||
|
||||
@@ -16,7 +16,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
|
||||
|
||||
BINARY = smupdated
|
||||
|
||||
@@ -65,7 +65,7 @@ all:
|
||||
$(MAKE) -f Makefile sourcemod
|
||||
|
||||
sourcemod: $(OBJ_LINUX)
|
||||
$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -lstdc++ -o$(BIN_DIR)/$(BINARY)
|
||||
$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -lstdc++ -o $(BIN_DIR)/$(BINARY)
|
||||
|
||||
debug:
|
||||
$(MAKE) -f Makefile all DEBUG=true
|
||||
|
||||
@@ -16,7 +16,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
|
||||
|
||||
BINARY = gamedatamd5
|
||||
|
||||
@@ -63,7 +63,7 @@ all:
|
||||
$(MAKE) -f Makefile sourcemod
|
||||
|
||||
sourcemod: $(OBJ_LINUX)
|
||||
$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -lstdc++ -o$(BIN_DIR)/$(BINARY)
|
||||
$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -lstdc++ -o $(BIN_DIR)/$(BINARY)
|
||||
|
||||
debug:
|
||||
$(MAKE) -f Makefile all DEBUG=true
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <malloc.h>
|
||||
#include <stdlib.h>
|
||||
#include "sm_memtable.h"
|
||||
|
||||
BaseMemTable::BaseMemTable(unsigned int init_size)
|
||||
|
||||
Reference in New Issue
Block a user