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_release.vpc | 44 +++++++++++++++++--------
 1 file changed, 30 insertions(+), 14 deletions(-)

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

diff --git a/sp/src/vpc_scripts/source_lib_win32_release.vpc b/sp/src/vpc_scripts/source_lib_win32_release.vpc
index 8f80eefc..c3138590 100644
--- a/sp/src/vpc_scripts/source_lib_win32_release.vpc
+++ b/sp/src/vpc_scripts/source_lib_win32_release.vpc
@@ -6,17 +6,34 @@
 
 $IgnoreRedundancyWarning	"ON"
 
-$MacroRequired				"PLATSUBDIR"
+// Disable frame pointer omission to allow fast stack walking, necessary for
+// good ETW profiling.
+$Macro  NOFPO  "1"
+
 $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 "Release"
 {
 	$General
 	{
 		// General
-		$IntermediateDirectory				".\Release$PLATSUBDIR"
+		$OutputDirectory					".\Release$_SUBDIRSUFFIX"		[!$VS2010 && !$RETAIL && !$PROFILE]
+		$OutputDirectory					".\Retail$_SUBDIRSUFFIX"		[!$VS2010 && $RETAIL]
+		$OutputDirectory					".\Profile$_SUBDIRSUFFIX"		[!$VS2010 && !$RETAIL && $PROFILE]
+		$OutputDirectory					"$OUTLIBDIR"					[$VS2010]
+		$IntermediateDirectory				".\Release$_SUBDIRSUFFIX"		[!$RETAIL && !$PROFILE]
+		$IntermediateDirectory				".\Retail$_SUBDIRSUFFIX"		[$RETAIL]
+		$IntermediateDirectory				".\Profile$_SUBDIRSUFFIX"		[!$RETAIL && $PROFILE]
 		$ExtensionsToDeleteOnClean
 		$BuildLogFile
 		$InheritedProjectPropertySheets
@@ -28,7 +45,7 @@ $Configuration "Release"
 		$MinimizeCRTUseInATL
 		$CharacterSet						"Use Multi-Byte Character Set"
 		$CommonLanguageRuntimeSupport
-		$WholeProgramOptimization
+		$WholeProgramOptimization			"Use Link Time Code Generation" [$LTCG]
 	}
 
 	$Debugging
@@ -65,9 +82,8 @@ $Configuration "Release"
 		$WholeProgramOptimization
 
 		// Preprocessor
-		$PreprocessorDefinitions			"WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-		// Enable asserts in release builds if /define:releaseasserts is specified on the VPC command line.
-		$PreprocessorDefinitions			"$BASE;RELEASEASSERTS" [$RELEASEASSERTS]
+		$PreprocessorDefinitions			"$BASE;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+		$PreprocessorDefinitions			"$BASE;RELEASE_ASSERTS" [$RELEASEASSERTS]
 		$IgnoreStandardIncludePath
 		$GeneratePreprocessedFile
 		$KeepComments
@@ -80,11 +96,10 @@ $Configuration "Release"
 		$BasicRuntimeChecks
 		$RuntimeLibrary						"Multi-threaded (/MT)"
 		$StructMemberAlignment
-		$BufferSecurityCheck				"Yes"	[$STAGING_ONLY]
-		$BufferSecurityCheck				"No"	[!$STAGING_ONLY]
+		$BufferSecurityCheck                "No"	[$RETAIL]
+		$BufferSecurityCheck 				"Yes"	[!$RETAIL]
 		$EnableFunctionLevelLinking			"Yes (/Gy)"
 		$EnableEnhancedInstructionSet
-		$EnableEnhancedInstructionSet				"Streaming SIMD Extensions (/arch:SSE)" [$WIN32]
 		$FloatingPointModel					"Fast (/fp:fast)"
 		$EnableFloatingPointExceptions
 
@@ -123,14 +138,15 @@ $Configuration "Release"
 		$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"
 		// Enable extra debugging information.
-		$AdditionalOptions					"$BASE /d2Zi+"
+		$AdditionalOptions					"$BASE /d2Zi+"  [$VS2010]
+		$AdditionalOptions					"$BASE /Oy-"	[$NOFPO]
 	}
 
 	$Librarian
@@ -199,4 +215,4 @@ $Configuration "Release"
 		$Outputs
 		$AdditionalDependencies
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3