Fixed Linux-only issue with The Ship
authorScott Ehlert <ds@alliedmods.net>
Wed Sep 06 07:10:08 2006 +0000 (2006-09-06)
changeset 2581b41db078a29
parent 257 8d2a87c0488f
child 259 6d4eb02f9845
Fixed Linux-only issue with The Ship
sourcemm/Makefile
sourcemm/changelog.txt
sourcemm/sample_mm/Makefile
sourcemm/sourcemm.h
     1.1 --- a/sourcemm/Makefile	Mon Sep 04 13:44:00 2006 +0000
     1.2 +++ b/sourcemm/Makefile	Wed Sep 06 07:10:08 2006 +0000
     1.3 @@ -13,8 +13,8 @@
     1.4  CPP = gcc-4.1
     1.5  BINARY = server_i486.so
     1.6  
     1.7 -OBJECTS = oslink.cpp util.cpp convar.cpp concommands.cpp \
     1.8 -	CSmmAPI.cpp sourcemm.cpp CPlugin.cpp sourcehook.cpp
     1.9 +OBJECTS = oslink.cpp util.cpp convar.cpp strtools.cpp concommands.cpp \
    1.10 +          CSmmAPI.cpp sourcemm.cpp CPlugin.cpp sourcehook.cpp
    1.11  
    1.12  LINK = vstdlib_i486.so tier0_i486.so -static-libgcc
    1.13  
    1.14 @@ -33,7 +33,7 @@
    1.15  
    1.16  GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
    1.17  
    1.18 -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-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse
    1.19 +CFLAGS += -D_LINUX -DNDEBUG -DHAVE_LONG_LONG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse
    1.20  
    1.21  ifeq "$(GCC_VERSION)" "4"
    1.22  	CFLAGS += $(GCC4_FLAGS)
    1.23 @@ -49,6 +49,7 @@
    1.24  	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
    1.25  	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
    1.26  	ln -sf $(HL2SDK)/tier1/convar.cpp convar.cpp
    1.27 +	ln -sf $(HL2SDK)/tier1/strtools.cpp strtools.cpp
    1.28  	ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp
    1.29  	$(MAKE) sourcemm
    1.30  	rm -rf $(BINARY)
     2.1 --- a/sourcemm/changelog.txt	Mon Sep 04 13:44:00 2006 +0000
     2.2 +++ b/sourcemm/changelog.txt	Wed Sep 06 07:10:08 2006 +0000
     2.3 @@ -1,3 +1,8 @@
     2.4 +2006/09/06 1.3a:
     2.5 + - Fixed a building issue on Linux which caused unresolved symbol errors when trying to
     2.6 +   to load Metamod:Source on a game using an older set of engine libraries. This fix should
     2.7 +   now allow Metamod:Source to run with The Ship on Linux.
     2.8 +
     2.9  2006/08/16 1.3:
    2.10   - Added SourceHook support for functions that return references.
    2.11   - Added some extra information to the "meta game" command: Description and Interface. For
     3.1 --- a/sourcemm/sample_mm/Makefile	Mon Sep 04 13:44:00 2006 +0000
     3.2 +++ b/sourcemm/sample_mm/Makefile	Wed Sep 06 07:10:08 2006 +0000
     3.3 @@ -13,7 +13,7 @@
     3.4  CPP = gcc-4.1
     3.5  BINARY = sample_mm_i486.so
     3.6  
     3.7 -OBJECTS = SamplePlugin.cpp cvars.cpp convar.cpp
     3.8 +OBJECTS = SamplePlugin.cpp cvars.cpp convar.cpp strtools.cpp
     3.9  
    3.10  LINK = vstdlib_i486.so tier0_i486.so -static-libgcc
    3.11  
    3.12 @@ -48,6 +48,7 @@
    3.13  	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
    3.14  	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
    3.15  	ln -sf $(HL2SDK)/tier1/convar.cpp convar.cpp
    3.16 +	ln -sf $(HL2SDK)/tier1/strtools.cpp strtools.cpp
    3.17  	$(MAKE) sourcemm
    3.18  	rm -rf $(BINARY)
    3.19  	ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
     4.1 --- a/sourcemm/sourcemm.h	Mon Sep 04 13:44:00 2006 +0000
     4.2 +++ b/sourcemm/sourcemm.h	Wed Sep 06 07:10:08 2006 +0000
     4.3 @@ -34,7 +34,7 @@
     4.4   *   increase vers_release when bug fix releases are made
     4.5   *   never increase major
     4.6   */
     4.7 -#define		SOURCEMM_VERSION	"1.3"
     4.8 +#define		SOURCEMM_VERSION	"1.3a"
     4.9  #define		SOURCEMM_DATE		__DATE__
    4.10  #define		SM_MAJOR_VERSION	1		//never need to increase this
    4.11  #define		SM_VERS_API_MAJOR	1		//increase this on a breaking change