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.
---
 sp/src/vpc_scripts/source_linux_base_project.vpc | 37 ++++++++++--------------
 1 file changed, 16 insertions(+), 21 deletions(-)

(limited to 'sp/src/vpc_scripts/source_linux_base_project.vpc')

diff --git a/sp/src/vpc_scripts/source_linux_base_project.vpc b/sp/src/vpc_scripts/source_linux_base_project.vpc
index 8dd136ba..f7fd40d5 100644
--- a/sp/src/vpc_scripts/source_linux_base_project.vpc
+++ b/sp/src/vpc_scripts/source_linux_base_project.vpc
@@ -1,4 +1,9 @@
 
+$Include "$SRCDIR\vpc_scripts\version.vpc"
+$Macro PLATSUBDIR	"\linux32"	[$LINUX32]
+
+$Macro LIBPUBLIC	"$SRCDIR\lib\public$PLATSUBDIR"
+$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR"
 
 $MacroRequired				"SRCDIR"
 
@@ -8,7 +13,7 @@ $Configuration "Debug"
 	$Compiler
 	{
 		$PreprocessorDefinitions			"DEBUG;_DEBUG"
-		$OptimizerLevel					"-gdwarf-2 -g $(OptimizerLevel_CompilerSpecific)"
+		$OptimizerLevel					"-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)"
 	}
 }
 
@@ -18,7 +23,7 @@ $Configuration "Release"
 	{
 		$PreprocessorDefinitions		"NDEBUG"
 		$PreprocessorDefinitions		"$BASE;RELEASEASSERTS" [$RELEASEASSERTS]
-		$OptimizerLevel				"-gdwarf-2 -g $(OptimizerLevel_CompilerSpecific)"
+		$OptimizerLevel				"-gdwarf-2 -g2 $(OptimizerLevel_CompilerSpecific)"
 	}
 }
 
@@ -32,23 +37,14 @@ $Configuration
 	$Compiler
 	{
 		$AdditionalIncludeDirectories	"$SRCDIR\common;$SRCDIR\public;$SRCDIR\public\tier0;$SRCDIR\public\tier1"
-		$AdditionalIncludeDirectories	"$BASE;/usr/include/malloc" [$OSX]
-		$PreprocessorDefinitions		"$BASE;POSIX;GNUC"
+		$PreprocessorDefinitions		"$BASE;GNUC;POSIX;COMPILER_GCC;MEMOVERRIDE_MODULE=$PROJECTNAME;_DLL_EXT=$_DLL_EXT"
 		$PreprocessorDefinitions		"$BASE;DEDICATED" [$DEDICATED]
-		$PreprocessorDefinitions		"$BASE;LINUX;_LINUX"		[$LINUXALL]
-		$PreprocessorDefinitions		"$BASE;_OSX;OSX;_DARWIN_UNLIMITED_SELECT;FD_SETSIZE=10240;" [$OSX32 || $OSX64]
-		$PreprocessorDefinitions		"$BASE;_DEMO"			[$DEMO]
+		$PreprocessorDefinitions		"$BASE;_LINUX;LINUX"		[$LINUXALL]
 		$SymbolVisibility				"hidden" 		[$POSIX]
-		$GCC_ExtraCompilerFlags			"$BASE -U_FORTIFY_SOURCE" [$LINUXALL]
-		$GCC_ExtraCompilerFlags			"$BASE -faddress-sanitizer" [$ADDRESSSANITIZER && $LINUXALL]
-
-		// Pass on appropriate branch define to preprocessor
-		$PreprocessorDefinitions		"$BASE;STAGING_ONLY" [$STAGING_ONLY]
-		$PreprocessorDefinitions		"$BASE;TF_BETA" [$TF_BETA]
-	}
-	$Linker
-	{
-		$GCC_ExtraLinkerFlags			"$BASE -faddress-sanitizer" [$ADDRESSSANITIZER && $LINUXALL]
+		$PreprocessorDefinitions		"$BASE;POSIX;_POSIX"		[$POSIX]
+		
+		$GCC_ExtraCompilerFlags			"-U_FORTIFY_SOURCE" [$LINUXALL]
+		$Create/UsePCHThroughFile	"stdafx.h"
 	}
 }
 
@@ -56,9 +52,8 @@ $Project
 {
 	$Folder "Link Libraries"
 	{
-		$ImpLib tier0   [!$IS_LIB_PROJECT]
-		$Lib	tier1     [!$IS_LIB_PROJECT]
-		$ImpLib vstdlib [!$IS_LIB_PROJECT]
-		$Lib	$SRCDIR/thirdparty/clang+llvm-3.1-x86-linux-ubuntu_12.04/lib/clang/3.1/lib/linux/libclang_rt.asan-i386 [$ADDRESSSANITIZER && $LINUXALL]
+		$ImpLib "$LIBPUBLIC\tier0"		[!$IS_LIB_PROJECT]
+		$Lib	"$LIBPUBLIC\tier1"		[!$IS_LIB_PROJECT]
+		$ImpLib "$LIBPUBLIC\vstdlib"	[!$IS_LIB_PROJECT]
 	}
 }
-- 
cgit v1.2.3