mirror of
https://github.com/alliedmodders/metamod-source.git
synced 2025-03-01 22:29:15 +01:00
Fixed Linux-only issue with The Ship
--HG-- extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40293
This commit is contained in:
parent
a42da91655
commit
272b868e70
@ -13,8 +13,8 @@ DEBUG_FLAGS = -g -ggdb3
|
|||||||
CPP = gcc-4.1
|
CPP = gcc-4.1
|
||||||
BINARY = server_i486.so
|
BINARY = server_i486.so
|
||||||
|
|
||||||
OBJECTS = oslink.cpp util.cpp convar.cpp concommands.cpp \
|
OBJECTS = oslink.cpp util.cpp convar.cpp strtools.cpp concommands.cpp \
|
||||||
CSmmAPI.cpp sourcemm.cpp CPlugin.cpp sourcehook.cpp
|
CSmmAPI.cpp sourcemm.cpp CPlugin.cpp sourcehook.cpp
|
||||||
|
|
||||||
LINK = vstdlib_i486.so tier0_i486.so -static-libgcc
|
LINK = vstdlib_i486.so tier0_i486.so -static-libgcc
|
||||||
|
|
||||||
@ -33,7 +33,7 @@ endif
|
|||||||
|
|
||||||
GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
|
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-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse
|
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
|
||||||
|
|
||||||
ifeq "$(GCC_VERSION)" "4"
|
ifeq "$(GCC_VERSION)" "4"
|
||||||
CFLAGS += $(GCC4_FLAGS)
|
CFLAGS += $(GCC4_FLAGS)
|
||||||
@ -49,6 +49,7 @@ all:
|
|||||||
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
|
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
|
||||||
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
|
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
|
||||||
ln -sf $(HL2SDK)/tier1/convar.cpp convar.cpp
|
ln -sf $(HL2SDK)/tier1/convar.cpp convar.cpp
|
||||||
|
ln -sf $(HL2SDK)/tier1/strtools.cpp strtools.cpp
|
||||||
ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp
|
ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp
|
||||||
$(MAKE) sourcemm
|
$(MAKE) sourcemm
|
||||||
rm -rf $(BINARY)
|
rm -rf $(BINARY)
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
2006/09/06 1.3a:
|
||||||
|
- Fixed a building issue on Linux which caused unresolved symbol errors when trying to
|
||||||
|
to load Metamod:Source on a game using an older set of engine libraries. This fix should
|
||||||
|
now allow Metamod:Source to run with The Ship on Linux.
|
||||||
|
|
||||||
2006/08/16 1.3:
|
2006/08/16 1.3:
|
||||||
- Added SourceHook support for functions that return references.
|
- Added SourceHook support for functions that return references.
|
||||||
- Added some extra information to the "meta game" command: Description and Interface. For
|
- Added some extra information to the "meta game" command: Description and Interface. For
|
||||||
|
@ -13,7 +13,7 @@ DEBUG_FLAGS = -g -ggdb3
|
|||||||
CPP = gcc-4.1
|
CPP = gcc-4.1
|
||||||
BINARY = sample_mm_i486.so
|
BINARY = sample_mm_i486.so
|
||||||
|
|
||||||
OBJECTS = SamplePlugin.cpp cvars.cpp convar.cpp
|
OBJECTS = SamplePlugin.cpp cvars.cpp convar.cpp strtools.cpp
|
||||||
|
|
||||||
LINK = vstdlib_i486.so tier0_i486.so -static-libgcc
|
LINK = vstdlib_i486.so tier0_i486.so -static-libgcc
|
||||||
|
|
||||||
@ -48,6 +48,7 @@ all:
|
|||||||
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
|
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
|
||||||
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
|
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
|
||||||
ln -sf $(HL2SDK)/tier1/convar.cpp convar.cpp
|
ln -sf $(HL2SDK)/tier1/convar.cpp convar.cpp
|
||||||
|
ln -sf $(HL2SDK)/tier1/strtools.cpp strtools.cpp
|
||||||
$(MAKE) sourcemm
|
$(MAKE) sourcemm
|
||||||
rm -rf $(BINARY)
|
rm -rf $(BINARY)
|
||||||
ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
|
ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
* increase vers_release when bug fix releases are made
|
* increase vers_release when bug fix releases are made
|
||||||
* never increase major
|
* never increase major
|
||||||
*/
|
*/
|
||||||
#define SOURCEMM_VERSION "1.3"
|
#define SOURCEMM_VERSION "1.3a"
|
||||||
#define SOURCEMM_DATE __DATE__
|
#define SOURCEMM_DATE __DATE__
|
||||||
#define SM_MAJOR_VERSION 1 //never need to increase this
|
#define SM_MAJOR_VERSION 1 //never need to increase this
|
||||||
#define SM_VERS_API_MAJOR 1 //increase this on a breaking change
|
#define SM_VERS_API_MAJOR 1 //increase this on a breaking change
|
||||||
|
Loading…
x
Reference in New Issue
Block a user