From afa0fcaa7438068c74ba3935fa367c72ce884b97 Mon Sep 17 00:00:00 2001
From: Peace-Maker <januk@freenet.de>
Date: Tue, 5 Feb 2013 21:26:40 +0000
Subject: [PATCH] Updated for CS:S sync (r=asherkin).

---
 AMBuildScript      | 8 ++++----
 core/Makefile      | 2 +-
 sample_mm/Makefile | 2 +-
 stub_mm/Makefile   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/AMBuildScript b/AMBuildScript
index 2506762..b7bb62f 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -266,7 +266,7 @@ class MMS:
 			else:
 				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
 			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			if sdk == 'ep2v':
+			if sdk in ['ep2v', 'css']:
 				libs = ['tier1_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
 				for lib in libs:
 					link = os.path.join(workFolder, lib)
@@ -275,7 +275,7 @@ class MMS:
 						os.lstat(link)
 					except:
 						job.AddCommand(SymlinkCommand(link, target))
-			elif sdk in ['css', 'l4d', 'l4d2', 'csgo']:
+			elif sdk in ['l4d', 'l4d2', 'csgo']:
 				libs = ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']
 				if sdk == 'csgo':
 					libs.insert(0, 'interfaces_i486.a')
@@ -372,10 +372,10 @@ class MMS:
 		if not noLink:
 			if AMBuild.target['platform'] == 'linux':
 				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
-				if sdk == 'ep2v':
+				if sdk in ['ep2v', 'css']:
 					compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
 					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
-				elif sdk in ['css', 'l4d', 'l4d2', 'csgo']:
+				elif sdk in ['l4d', 'l4d2', 'csgo']:
 					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
 					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
 				else:
diff --git a/core/Makefile b/core/Makefile
index 92ab6da..82657a7 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -57,7 +57,7 @@ ifeq "$(ENGINE)" "css"
 	INCLUDE += -I$(HL2SDK)/public/game/server
 	BINARY = metamod.2.css.so
 	LIB_PREFIX = lib
-	LIB_SUFFIX = .so
+	LIB_SUFFIX = _srv.so
 	override ENGSET = true
 endif
 ifeq "$(ENGINE)" "orangeboxvalve"
diff --git a/sample_mm/Makefile b/sample_mm/Makefile
index 9b81e0d..bc38cc4 100644
--- a/sample_mm/Makefile
+++ b/sample_mm/Makefile
@@ -100,7 +100,7 @@ ifneq (,$(filter original orangebox,$(ENGINE)))
 	LIB_SUFFIX = _i486.$(LIB_EXT)
 else
 	LIB_PREFIX = lib
-	ifeq "$(ENGINE)" "orangeboxvalve"
+	ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
 		ifneq "$(OS)" "Darwin"
 			LIB_SUFFIX = _srv.$(LIB_EXT)
 		else
diff --git a/stub_mm/Makefile b/stub_mm/Makefile
index 9d38cee..25694b1 100644
--- a/stub_mm/Makefile
+++ b/stub_mm/Makefile
@@ -100,7 +100,7 @@ ifneq (,$(filter original orangebox,$(ENGINE)))
 	LIB_SUFFIX = _i486.$(LIB_EXT)
 else
 	LIB_PREFIX = lib
-	ifeq "$(ENGINE)" "orangeboxvalve"
+	ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
 		ifneq "$(OS)" "Darwin"
 			LIB_SUFFIX = _srv.$(LIB_EXT)
 		else