From 5ec4b3441e5ff603205110c27fe619739367d521 Mon Sep 17 00:00:00 2001
From: Fyren <fyrenmoo@gmail.com>
Date: Fri, 23 Apr 2010 11:39:12 -0700
Subject: [PATCH] Build stuff for L4D2 DLC (bug 4361, r=SAWCE)

---
 AMBuildScript                |  6 +++---
 core/Makefile                | 10 +++++-----
 extensions/sdktools/Makefile |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/AMBuildScript b/AMBuildScript
index 8c8ad0c2..8f307627 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -201,7 +201,7 @@ class SM:
 				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
 			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
 			if sdk == 'l4d2':
-				for i in ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_linux.so', 'tier0_linux.so']:
+				for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']:
 					link = os.path.join(workFolder, i)
 					target = os.path.join(staticLibs, i)
 					try:
@@ -269,8 +269,8 @@ class SM:
 			if AMBuild.target['platform'] == 'linux':
 				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
 				if sdk == 'l4d2':
-					compiler['POSTLINKFLAGS'][0:0] = ['tier0_linux.so']
-					compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_linux.so']
+					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
+					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
 				else:
 					compiler['POSTLINKFLAGS'][0:0] = ['tier0_i486.so']
 					compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_i486.so']				
diff --git a/core/Makefile b/core/Makefile
index a40846b4..8db97c64 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -100,7 +100,7 @@ ifeq "$(ENGINE)" "left4dead2"
 	CFLAGS += -DSOURCE_ENGINE=6
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server
-	SRCDS = $(SRCDS_BASE)/left4dead2_demo
+	SRCDS = $(SRCDS_BASE)/left4dead2
 	BINARY = sourcemod.2.l4d2.so
 	override ENGSET = true
 endif
@@ -108,8 +108,8 @@ endif
 CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6
 
 ifeq "$(ENGINE)" "left4dead2"
-LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_linux.so \
-	tier0_linux.so -static-libgcc
+LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a libvstdlib.so \
+	libtier0.so -static-libgcc
 else
 LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
 	tier0_i486.so -static-libgcc
@@ -154,8 +154,8 @@ $(BIN_DIR)/%.o: %.c
 all: check
 	mkdir -p $(BIN_DIR)
 ifeq "$(ENGINE)" "left4dead2"
-	ln -sf $(SRCDS)/bin/vstdlib_linux.so vstdlib_linux.so;
-	ln -sf $(SRCDS)/bin/tier0_linux.so tier0_linux.so;
+	ln -sf $(SRCDS)/bin/libvstdlib.so libvstdlib.so;
+	ln -sf $(SRCDS)/bin/libtier0.so libtier0.so;
 else
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so;
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so;
diff --git a/extensions/sdktools/Makefile b/extensions/sdktools/Makefile
index 18234dc8..77105f1e 100644
--- a/extensions/sdktools/Makefile
+++ b/extensions/sdktools/Makefile
@@ -86,13 +86,13 @@ ifeq "$(ENGINE)" "left4dead2"
 	CFLAGS += -DSOURCE_ENGINE=6
 	METAMOD = $(MMSOURCE17)/core
 	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
-	SRCDS = $(SRCDS_BASE)/left4dead2_demo
+	SRCDS = $(SRCDS_BASE)/left4dead2
 	GAMEFIX = 2.l4d2
 	override ENGSET = true
 endif
 
 ifeq "$(ENGINE)" "left4dead2"
-	LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_linux.so tier0_linux.so
+	LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a libvstdlib.so libtier0.so
 else
 	LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so tier0_i486.so
 endif
@@ -150,8 +150,8 @@ $(BIN_DIR)/%.o: %.cpp
 all: check
 	mkdir -p $(BIN_DIR)/sdk
 ifeq "$(ENGINE)" "left4dead2"
-	ln -sf $(SRCDS)/bin/vstdlib_linux.so vstdlib_linux.so;
-	ln -sf $(SRCDS)/bin/tier0_linux.so tier0_linux.so;
+	ln -sf $(SRCDS)/bin/libvstdlib.so libvstdlib.so;
+	ln -sf $(SRCDS)/bin/libtier0.so libtier0.so;
 else
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so;
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so;