source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-07 18:38:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fixed loading on Left 4 Dead 2 since DLC (The Passing) update (bug 4358, r=dvander, a=blocking).

Browse Source
This commit is contained in:
Scott Ehlert 2010-04-23 06:04:27 -04:00
parent 20ae009d9b
commit aed977476d
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/Makefile
View File

@ -42,7 +42,7 @@ ifeq "$(ENGINE)" "orangebox"
INCLUDE += -I$(HL2SDK)/public/game/server INCLUDE += -I$(HL2SDK)/public/game/server
SRCDS = $(SRCDS_BASE)/orangebox SRCDS = $(SRCDS_BASE)/orangebox
BINARY = metamod.2.ep2.so BINARY = metamod.2.ep2.so
LIB_SUFFIX = i486 LIB_SUFFIX = _i486.so
override ENGSET = true override ENGSET = true
endif endif
ifeq "$(ENGINE)" "orangeboxvalve" ifeq "$(ENGINE)" "orangeboxvalve"
@ -53,7 +53,7 @@ ifeq "$(ENGINE)" "orangeboxvalve"
INCLUDE += -I$(HL2SDK)/public/game/server INCLUDE += -I$(HL2SDK)/public/game/server
SRCDS = $(SRCDS_BASE)/orangebox SRCDS = $(SRCDS_BASE)/orangebox
BINARY = metamod.2.ep2v.so BINARY = metamod.2.ep2v.so
LIB_SUFFIX = i486 LIB_SUFFIX = _i486.so
override ENGSET = true override ENGSET = true
endif endif
ifeq "$(ENGINE)" "left4dead" ifeq "$(ENGINE)" "left4dead"
@ -64,7 +64,7 @@ ifeq "$(ENGINE)" "left4dead"
INCLUDE += -I$(HL2SDK)/public/game/server INCLUDE += -I$(HL2SDK)/public/game/server
SRCDS = $(SRCDS_BASE)/l4d SRCDS = $(SRCDS_BASE)/l4d
BINARY = metamod.2.l4d.so BINARY = metamod.2.l4d.so
LIB_SUFFIX = i486 LIB_SUFFIX = _i486.so
override ENGSET = true override ENGSET = true
endif endif
ifeq "$(ENGINE)" "left4dead2" ifeq "$(ENGINE)" "left4dead2"
@ -75,13 +75,15 @@ ifeq "$(ENGINE)" "left4dead2"
INCLUDE += -I$(HL2SDK)/public/game/server INCLUDE += -I$(HL2SDK)/public/game/server
SRCDS = $(SRCDS_BASE)/left4dead2_demo SRCDS = $(SRCDS_BASE)/left4dead2_demo
BINARY = metamod.2.l4d2.so BINARY = metamod.2.l4d2.so
LIB_SUFFIX = linux LIB_PREFIX = lib
LIB_SUFFIX = .so
override ENGSET = true override ENGSET = true
endif endif
CFLAGS += -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6 CFLAGS += -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6
LINK += $(HL2LIB)/tier1_i486.a vstdlib_$(LIB_SUFFIX).so tier0_$(LIB_SUFFIX).so -static-libgcc LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \
-static-libgcc
INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \ INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -Isourcehook -I../loader -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -Isourcehook -I../loader
@ -122,8 +124,8 @@ all: check
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
mkdir -p $(BIN_DIR)/provider mkdir -p $(BIN_DIR)/provider
mkdir -p $(BIN_DIR)/sourcehook mkdir -p $(BIN_DIR)/sourcehook
ln -sf $(HL2LIB)/vstdlib_$(LIB_SUFFIX).so ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX)
ln -sf $(HL2LIB)/tier0_$(LIB_SUFFIX).so ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX)
$(MAKE) -f Makefile metamod $(MAKE) -f Makefile metamod
check: check:

2
core/provider/provider_ep2.cpp
View File

@ -127,7 +127,7 @@ void BaseProvider::Notify_DLLInit_Pre(CreateInterfaceFn engineFactory,
gameclients = (IServerGameClients *)(serverFactory("ServerGameClients004", NULL)); gameclients = (IServerGameClients *)(serverFactory("ServerGameClients004", NULL));
} }
baseFs = (IFileSystem *)((engineFactory)(FILESYSTEM_INTERFACE_VERSION, NULL)); baseFs = (IFileSystem *)((engineFactory)(BASEFILESYSTEM_INTERFACE_VERSION, NULL));
if (baseFs == NULL) if (baseFs == NULL)
{ {
mm_LogMessage("Unable to find \"%s\": .vdf files will not be parsed", FILESYSTEM_INTERFACE_VERSION); mm_LogMessage("Unable to find \"%s\": .vdf files will not be parsed", FILESYSTEM_INTERFACE_VERSION);

6
loader/Makefile
View File

@ -21,11 +21,11 @@ CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
CPP = gcc-4.1 CPP = gcc-4.1
ifeq "$(ENGINE)" "left4dead2" ifeq "$(ENGINE)" "left4dead2"
BINARY = server_linux.so BINARY = server.so
CFLAGS += -DLIB_SUFFIX=\"_linux.so\" CFLAGS += -DLIB_PREFIX=\"lib\" -DLIB_SUFFIX=\".so\"
else else
BINARY = server_i486.so BINARY = server_i486.so
CFLAGS += -DLIB_SUFFIX=\"_i486.so\" CFLAGS += -DLIB_PREFIX=\"\" -DLIB_SUFFIX=\"_i486.so\"
endif endif
LINK += -static-libgcc LINK += -static-libgcc

4
loader/loader.cpp
View File

@ -180,8 +180,8 @@ mm_GetProcAddress(const char *name)
#define TIER0_NAME "bin\\tier0.dll" #define TIER0_NAME "bin\\tier0.dll"
#define VSTDLIB_NAME "bin\\vstdlib.dll" #define VSTDLIB_NAME "bin\\vstdlib.dll"
#elif defined __linux__ #elif defined __linux__
#define TIER0_NAME "bin/tier0" LIB_SUFFIX #define TIER0_NAME "bin/" LIB_PREFIX "tier0" LIB_SUFFIX
#define VSTDLIB_NAME "bin/vstdlib" LIB_SUFFIX #define VSTDLIB_NAME "bin/" LIB_PREFIX "vstdlib" LIB_SUFFIX
#endif #endif
const char * const char *