Merge remote-tracking branch 'upstream/master' into vbsp-fixes.

1 files changed, 71 insertions, 64 deletions

diff --git a/mp/src/vpc_scripts/source_exe_posix_base.vpc b/mp/src/vpc_scripts/source_exe_posix_base.vpc
index d864cc0e..23d7637d 100644
--- a/mp/src/vpc_scripts/source_exe_posix_base.vpc
+++ b/mp/src/vpc_scripts/source_exe_posix_base.vpc
@@ -1,64 +1,71 @@
-//-----------------------------------------------------------------------------

-//	SOURCE_EXE_posix.VPC

-//

-//	Base Settings for Source(TM) Projects

-//-----------------------------------------------------------------------------

-

-$Include "$SRCDIR\vpc_scripts\version.vpc"

-$Include "$SRCDIR\vpc_scripts\source_posix_base.vpc"

-

-$MacroRequired				"SRCDIR"

-$MacroRequired				"OUTBINNAME"	"$PROJECTNAME"

-

-$Include "$SRCDIR\vpc_scripts\loadaddress.vpc"

-

-

-$IgnoreRedundancyWarning	"ON"

-

-$Configuration

-{

-	$General

-	{

-		$ConfigurationType				"Application (.exe)"

-	}

-

-	$Linker

-	{

-			$OutputFile								"$SRCDIR/../game/$OUTBINNAME"

-	}

-}

-

-$Project

-{

-	$Folder	"Source Files"

-	{

-		$File	"$SRCDIR\public\tier0\memoverride.cpp"

-		{

-			$Configuration

-			{

-				$Compiler

-				{

-					$Create/UsePrecompiledHeader	"Not Using Precompiled Headers"

-				}

-			}

-		}

-	}

-

-

-	$Folder "Resources"

-	{

-		$File	"$ROOTSCRIPT"

-	}

-	

-	

-	$Folder	"Link Libraries"

-	{

-		$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]

-	}

-}

-

+//-----------------------------------------------------------------------------
+//	SOURCE_EXE_posix.VPC
+//
+//	Base Settings for Source(TM) Projects
+//-----------------------------------------------------------------------------
+
+$Include "$SRCDIR\vpc_scripts\version.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"
+
+
+$IgnoreRedundancyWarning	"ON"
+
+$Configuration
+{
+	$General
+	{
+		$ConfigurationType				"Application (.exe)"
+	}
+
+	$Compiler
+	{
+		$PreprocessorDefinitions		"$BASE;EXENAME=$OUTBINNAME"
+	}
+
+	$Linker
+	{
+		$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]
+	}
+}
+
+$Project
+{
+	$Folder	"Source Files"
+	{
+		$File	"$SRCDIR\public\tier0\memoverride.cpp"
+		{
+			$Configuration
+			{
+				$Compiler
+				{
+					$Create/UsePrecompiledHeader	"Not Using Precompiled Headers"
+				}
+			}
+		}
+	}
+
+
+	$Folder "Resources"
+	{
+		$File	"$ROOTSCRIPT"
+	}
+
+	$Folder	"Link Libraries" [$LINUXALL&&!$DEDICATED]
+	{
+		$File	"$SRCDIR/thirdparty/gperftools-2.0/.libs/libtcmalloc_minimal.so"
+	}
+}
+