diff --git a/core/Makefile.ep1 b/core/Makefile.ep1 index c14f55d9..01002949 100644 --- a/core/Makefile.ep1 +++ b/core/Makefile.ep1 @@ -1,7 +1,7 @@ #(C)2004-2006 SourceMM Development Team # Makefile written by David "BAILOPAN" Anderson -SMM_BASE = ../../sourcemm +SMM_BASE = ../../sourcemm-1.6 HL2SDK = ../../hl2sdk SMSDK = .. SRCDS = ~/srcds diff --git a/core/Makefile.ep2 b/core/Makefile.ep2 index 99f9dbbf..e5376eb8 100644 --- a/core/Makefile.ep2 +++ b/core/Makefile.ep2 @@ -1,7 +1,7 @@ #(C)2004-2006 SourceMM Development Team # Makefile written by David "BAILOPAN" Anderson -SMM_BASE = ../../sourcemm +SMM_BASE = ../../sourcemm-1.6 HL2SDK = ../../hl2sdk-ob SMSDK = .. SRCDS = ~/srcds @@ -58,7 +58,10 @@ endif GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) -CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-uninitialized -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DSM_DEFAULT_THREADER -DORANGEBOX_BUILD +CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ + -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp \ + -Wall -Wno-uninitialized -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DSM_DEFAULT_THREADER \ + -DORANGEBOX_BUILD -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ifeq "$(GCC_VERSION)" "4" @@ -86,7 +89,7 @@ all: $(MAKE) -f Makefile.ep2 sourcemod sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C) - $(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) -f Makefile.ep2 all DEBUG=true diff --git a/core/Makefile.orig b/core/Makefile.orig index fe895f49..278ca7e8 100644 --- a/core/Makefile.orig +++ b/core/Makefile.orig @@ -1,7 +1,7 @@ #(C)2004-2006 SourceMM Development Team # Makefile written by David "BAILOPAN" Anderson -SMM_BASE = ../../sourcemm-1.4.2 +SMM_BASE = ../../sourcemm-1.4 HL2SDK = ../../hl2sdk SMSDK = .. SRCDS = ~/srcds @@ -58,7 +58,10 @@ endif GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) -CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-uninitialized -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DSM_DEFAULT_THREADER +CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ + -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ + -Dstrcmpi=strcasecmp -Wall -Wno-uninitialized -Werror -fPIC -mfpmath=sse -msse \ + -DSOURCEMOD_BUILD -DSM_DEFAULT_THREADER -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ifeq "$(GCC_VERSION)" "4" @@ -85,7 +88,7 @@ all: $(MAKE) -f Makefile.orig sourcemod sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C) - $(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) -f Makefile.orig all DEBUG=true diff --git a/extensions/cstrike/Makefile.orig b/extensions/cstrike/Makefile.orig index 4ae96fd1..51504fca 100644 --- a/extensions/cstrike/Makefile.orig +++ b/extensions/cstrike/Makefile.orig @@ -3,7 +3,7 @@ SMSDK = ../.. SRCDS = ~/srcds -SOURCEMM = ../../../sourcemm-1.4.2 +SOURCEMM = ../../../sourcemm-1.4 HL2SDK = ../../../hl2sdk ##################################### @@ -37,8 +37,8 @@ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2 CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp \ - -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti + -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32 +CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ################################################ ### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ### @@ -72,7 +72,7 @@ all: $(MAKE) -f Makefile.orig extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) -f Makefile.orig all DEBUG=true diff --git a/extensions/geoip/Makefile b/extensions/geoip/Makefile index 14f9df77..fce544d6 100644 --- a/extensions/geoip/Makefile +++ b/extensions/geoip/Makefile @@ -3,7 +3,7 @@ SMSDK = ../.. SRCDS = ~/srcds -SOURCEMM = ../../../sourcemm +SOURCEMM = ../../../sourcemm-1.6 ##################################### ### EDIT BELOW FOR OTHER PROJECTS ### @@ -36,7 +36,10 @@ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2 -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \ -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD +CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ + -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ + -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD \ + -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ################################################ @@ -75,7 +78,7 @@ all: $(MAKE) extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) all DEBUG=true diff --git a/extensions/mysql/Makefile b/extensions/mysql/Makefile index 46a8e18b..5af33974 100644 --- a/extensions/mysql/Makefile +++ b/extensions/mysql/Makefile @@ -3,7 +3,7 @@ SMSDK = ../.. SRCDS = ~/srcds -SOURCEMM = ../../../sourcemm +SOURCEMM = ../../../sourcemm-1.6 MYSQL = ../../../mysql-5.0 ##################################### @@ -41,7 +41,10 @@ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine \ -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -I$(MYSQL)/include -CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -Wno-switch +CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ + -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ + -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H \ + -Wno-switch -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ################################################ @@ -77,7 +80,7 @@ all: $(MAKE) extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) all DEBUG=true diff --git a/extensions/sdktools/Makefile.ep2 b/extensions/sdktools/Makefile.ep2 index 19875fd8..b82a0b6d 100644 --- a/extensions/sdktools/Makefile.ep2 +++ b/extensions/sdktools/Makefile.ep2 @@ -3,7 +3,7 @@ SMSDK = ../.. SRCDS = ~/srcds -SOURCEMM = ../../../sourcemm +SOURCEMM = ../../../sourcemm-1.6 HL2SDK = ../../../hl2sdk-ob ##################################### @@ -39,7 +39,7 @@ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2 CFLAGS = -D_LINUX -DNDEBUG -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 \ - -Wno-unused -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -DORANGEBOX_BUILD + -Wno-unused -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -DORANGEBOX_BUILD -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-threadsafe-statics ################################################ @@ -74,7 +74,7 @@ all: $(MAKE) -f Makefile.ep2 extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) -f Makefile.ep2 all DEBUG=true diff --git a/extensions/sdktools/Makefile.orig b/extensions/sdktools/Makefile.orig index a509365a..b34a3e4a 100644 --- a/extensions/sdktools/Makefile.orig +++ b/extensions/sdktools/Makefile.orig @@ -3,7 +3,7 @@ SMSDK = ../.. SRCDS = ~/srcds -SOURCEMM = ../../../sourcemm-1.4.2 +SOURCEMM = ../../../sourcemm-1.4 HL2SDK = ../../../hl2sdk ##################################### @@ -39,7 +39,7 @@ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2 CFLAGS = -D_LINUX -DNDEBUG -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 \ - -Wno-unused -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H + -Wno-unused -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-threadsafe-statics ################################################ @@ -74,7 +74,7 @@ all: $(MAKE) -f Makefile.orig extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) -f Makefile.orig all DEBUG=true diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index 602af760..2839482d 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -3,7 +3,7 @@ SMSDK = ../.. SRCDS = ~/srcds -SOURCEMM = ../../../sourcemm +SOURCEMM = ../../../sourcemm-1.6 ##################################### ### EDIT BELOW FOR OTHER PROJECTS ### @@ -55,7 +55,10 @@ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2 -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SOURCEMM) -I$(SOURCEMM)/sourcehook -I$(SOURCEMM)/sourcemm \ -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -Wno-uninitialized -DSQLITE_THREADSAFE -DSQLITE_OMIT_LOAD_EXTENSION +CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ + -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ + -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -Wno-uninitialized \ + -DSQLITE_THREADSAFE -DSQLITE_OMIT_LOAD_EXTENSION -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ################################################ @@ -96,7 +99,7 @@ all: $(MAKE) extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) all DEBUG=true diff --git a/extensions/topmenus/Makefile b/extensions/topmenus/Makefile index 1aa654e0..769d133a 100644 --- a/extensions/topmenus/Makefile +++ b/extensions/topmenus/Makefile @@ -3,7 +3,7 @@ SMSDK = ../.. SRCDS = ~/srcds -SOURCEMM = ../../../sourcemm +SOURCEMM = ../../../sourcemm-1.6 HL2SDK = ../../../hl2sdk ##################################### @@ -36,7 +36,10 @@ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2 -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SOURCEMM) -I$(SOURCEMM)/sourcehook -I$(SOURCEMM)/sourcemm \ -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -CFLAGS = -D_LINUX -DNDEBUG -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 -Wno-unused -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -Wno-uninitialized +CFLAGS = -D_LINUX -DNDEBUG -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 -Wno-unused -fPIC -mfpmath=sse -msse \ + -DSOURCEMOD_BUILD -DHAVE_STDINT_H -Wno-uninitialized -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ################################################ @@ -71,7 +74,7 @@ all: $(MAKE) extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) all DEBUG=true diff --git a/loader/Makefile b/loader/Makefile index 889dca2c..a1fe7f02 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -5,7 +5,7 @@ # running against Metamod:Source. SMSDK = .. -SOURCEMM = ../../sourcemm +SOURCEMM = ../../sourcemm-1.6 ##################################### ### EDIT BELOW FOR OTHER PROJECTS ### @@ -29,7 +29,10 @@ LINK = -static-libgcc INCLUDE = -I. -I.. -Isdk -I$(SOURCEMM) -I$(SOURCEMM)/sourcehook -I$(SOURCEMM)/sourcemm \ -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -Wno-uninitialized +CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ + -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ + -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H \ + -Wno-uninitialized -m32 CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti ################################################ @@ -62,7 +65,7 @@ all: $(MAKE) extension extension: $(OBJ_LINUX) - $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: $(MAKE) all DEBUG=true