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_lib_win32_debug.vpc | 28 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

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

diff --git a/sp/src/vpc_scripts/source_lib_win32_debug.vpc b/sp/src/vpc_scripts/source_lib_win32_debug.vpc
index a3eba728..981300da 100644
--- a/sp/src/vpc_scripts/source_lib_win32_debug.vpc
+++ b/sp/src/vpc_scripts/source_lib_win32_debug.vpc
@@ -6,17 +6,26 @@
 
 $IgnoreRedundancyWarning	"ON"
 
-$MacroRequired				"PLATSUBDIR"
 $MacroRequired				"SRCDIR"
 $MacroRequired				"OUTLIBNAME"
 $MacroRequired				"OUTLIBDIR"
+$MacroRequired				"LIBPUBLIC"
+$MacroRequired				"LIBCOMMON"
+$MacroRequired				"PLATSUBDIR"
+$MacroRequiredAllowEmpty	"GAMENAME"
+$MacroRequiredAllowEmpty	"INTERMEDIATESUBDIR"
+$MacroRequiredAllowEmpty	"_UNITYSUBDIR"
+$MacroRequiredAllowEmpty	"_STATICSUBDIR"
+$Macro						"_SUBDIRSUFFIX"		"$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR"
 
 $Configuration "Debug"
 {
 	$General	
 	{
 		// General
-		$IntermediateDirectory				".\Debug$PLATSUBDIR"
+		$OutputDirectory					".\Debug$_SUBDIRSUFFIX"		[!$VS2010]
+		$OutputDirectory					"$OUTLIBDIR"				[$VS2010]
+		$IntermediateDirectory				".\Debug$_SUBDIRSUFFIX"
 		$ExtensionsToDeleteOnClean
 		$BuildLogFile
 		$InheritedProjectPropertySheets
@@ -48,8 +57,8 @@ $Configuration "Debug"
 		// General
 		$AdditionalIncludeDirectories		"$SRCDIR\common;$SRCDIR\public;$SRCDIR\public\tier0;$SRCDIR\public\tier1"
 		$Resolve#UsingReferences
-		$DebugInformationFormat				"Program Database for Edit & Continue (/ZI)" [!$EANDCDISABLED && !$WIN64]
-		$DebugInformationFormat				"Program Database (/Zi)"                     [$EANDCDISABLED || $WIN64]
+		$DebugInformationFormat				"Program Database for Edit & Continue (/ZI)" [$WIN32]
+		$DebugInformationFormat				"Program Database (/Zi)" [$WIN64]		
 		$SuppressStartupBanner		
 		$WarningLevel						"Level 4 (/W4)"
 		$Detect64bitPortabilityIssues		"Yes (/Wp64)"
@@ -66,7 +75,7 @@ $Configuration "Debug"
 		$WholeProgramOptimization
 
 		// Preprocessor
-		$PreprocessorDefinitions			"_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+		$PreprocessorDefinitions			"$BASE;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 		$IgnoreStandardIncludePath
 		$GeneratePreprocessedFile
 		$KeepComments
@@ -86,7 +95,6 @@ $Configuration "Debug"
 		$BufferSecurityCheck				"Yes"
 		$EnableFunctionLevelLinking
 		$EnableEnhancedInstructionSet
-		$EnableEnhancedInstructionSet				"Streaming SIMD Extensions (/arch:SSE)" [$WIN32]
 		$FloatingPointModel					"Fast (/fp:fast)"
 		$EnableFloatingPointExceptions
 
@@ -125,12 +133,12 @@ $Configuration "Debug"
 		$ShowIncludes
 		$UndefinePreprocessorDefinitions
 		$UndefineAllPreprocessorDefinitions
-		$UseFullPaths
+		$UseFullPaths						"Yes (/FC)"
 		$OmitDefaultLibraryNames
 		$ErrorReporting						"Prompt Immediately (/errorReport:prompt)"
 
-		// Command Line
-		$AdditionalOptions					"$BASE /MP"
+		// Command Line (L4D adding /MP)
+		$AdditionalOptions					"/MP"	[$VS2005]
 	}
 
 	$Librarian
@@ -199,4 +207,4 @@ $Configuration "Debug"
 		$Outputs
 		$AdditionalDependencies
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3