From a0c29e7dd67abb15c74c85f07741784877edfdcd Mon Sep 17 00:00:00 2001
From: Joe Ludwig <joe@valvesoftware.com>
Date: Mon, 2 Sep 2013 11:39:10 -0700
Subject: General: * Fixed a variety of server browser issues with mods based
 on this SDK * Fixed many warnings on various platforms * Added source code
 for fgdlib and raytrace * Updated many source files with the latest shared
 source from TF2.

OSX:
* Added support for Xcode 4.6
* Switched OSX builds to use Xcode instead of makefiles
* Moved libs from src/lib/osx32 to src/lib/public/osx32 or src/lib/common/osx32 to match windows better.

Linux:
* Moved libs from src/lib/linux32 to src/lib/public/linux32 or src/lib/common/linux32 to match windows better.
---
 mp/src/vpc_scripts/source_exe_posix_base.vpc | 29 +++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'mp/src/vpc_scripts/source_exe_posix_base.vpc')

diff --git a/mp/src/vpc_scripts/source_exe_posix_base.vpc b/mp/src/vpc_scripts/source_exe_posix_base.vpc
index d864cc0e..33e7b2a6 100644
--- a/mp/src/vpc_scripts/source_exe_posix_base.vpc
+++ b/mp/src/vpc_scripts/source_exe_posix_base.vpc
@@ -5,10 +5,11 @@
 //-----------------------------------------------------------------------------
 
 $Include "$SRCDIR\vpc_scripts\version.vpc"
-$Include "$SRCDIR\vpc_scripts\source_posix_base.vpc"
 
 $MacroRequired				"SRCDIR"
 $MacroRequired				"OUTBINNAME"	"$PROJECTNAME"
+$Macro IS_LIB_PROJECT		"1"
+$Include "$SRCDIR\vpc_scripts\source_posix_base.vpc"
 
 $Include "$SRCDIR\vpc_scripts\loadaddress.vpc"
 
@@ -22,9 +23,21 @@ $Configuration
 		$ConfigurationType				"Application (.exe)"
 	}
 
+	$Compiler
+	{
+		$PreprocessorDefinitions		"$BASE;EXENAME=$OUTBINNAME"
+	}
+
 	$Linker
 	{
-			$OutputFile								"$SRCDIR/../game/$OUTBINNAME"
+		$OutputFile						"$SRCDIR/../game/$OUTBINNAME"
+
+		// In order to get the Valve standard allocator memory alignment (16-byte
+		// alignment for objects that are a multiple of 16 bytes) we use tcmalloc.
+		// Using -l will ask the linker to use it, but if there are no references
+		// to malloc/free then it may not actually use it. Wrapping the flag in the
+		// as-needed controls forces it to be pulled in (from libtcmalloc_minimal.so).
+		$GCC_ExtraLinkerFlags			"-Wl,--no-as-needed -ltcmalloc_minimal -Wl,--as-needed" [$LINUXALL&&!$DEDICATED]
 	}
 }
 
@@ -49,16 +62,10 @@ $Project
 	{
 		$File	"$ROOTSCRIPT"
 	}
-	
-	
-	$Folder	"Link Libraries"
+
+	$Folder	"Link Libraries" [$LINUXALL&&!$DEDICATED]
 	{
-		$ImpLib tier0	[$LINUXALL]
-		$Lib	tier1	[$LINUXALL]
-		$ImpLib vstdlib	[$LINUXALL]
-		$DynamicFile	"$SRCDIR\lib\$PLATFORM\$_IMPLIB_PREFIXtier0$_IMPLIB_EXT"	[!$LINUXALL]
-		$DynamicFile	"$SRCDIR\lib\$PLATFORM\tier1$_STATICLIB_EXT"				[!$LINUXALL]
-		$DynamicFile	"$SRCDIR\lib\$PLATFORM\$_IMPLIB_PREFIXvstdlib$_IMPLIB_EXT"	[!$LINUXALL]
+		$File	"$SRCDIR/thirdparty/gperftools-2.0/.libs/libtcmalloc_minimal.so"
 	}
 }
 
-- 
cgit v1.2.3