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

1 files changed, 46 insertions, 17 deletions

diff --git a/mp/src/vpc_scripts/source_base.vpc b/mp/src/vpc_scripts/source_base.vpc
index fc70c2e5..17de60eb 100644
--- a/mp/src/vpc_scripts/source_base.vpc
+++ b/mp/src/vpc_scripts/source_base.vpc
@@ -1,17 +1,46 @@
-//-----------------------------------------------------------------------------

-//	source_base.VPC

-//

-//  This is the base VPC file that is included by all others, on all platforms.

-//

-//	Project Script

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

-

-// Set which branch we are building out of.

-// This is one file we expect to be different between branches and so it must be merged carefully

-

-// Staging branch:

-//$Conditional STAGING_ONLY	"1"

-

-// rel/tf_beta branch:

-//$Conditional TF_BETA	"1"

-

+//-----------------------------------------------------------------------------
+//	source_base.VPC
+//
+//  This is the base VPC file that is included by all others, on all platforms.
+//
+//	Project Script
+//-----------------------------------------------------------------------------
+
+// Set which branch we are building out of.
+// This is one file we expect to be different between branches and so it must be merged carefully
+
+// Staging branch:
+//$Conditional STAGING_ONLY	"1"
+
+// rel/tf_beta branch:
+//$Conditional TF_BETA	"1"
+
+$Configuration "Debug"
+{
+	$Compiler
+	{
+		// Pass on appropriate branch define to preprocessor
+		$PreprocessorDefinitions		"VPC"
+		$PreprocessorDefinitions		"$BASE;STAGING_ONLY" [$STAGING_ONLY]
+		$PreprocessorDefinitions		"$BASE;TF_BETA" [$TF_BETA]
+		$PreprocessorDefinitions		"$BASE;RAD_TELEMETRY_DISABLED" [$SOURCESDK]
+// Need to revisit the code to make things run with the _RETAIL preprocessor definition
+// This line was added in the previous check-in, but had previously not been defined in this branch
+//		$PreprocessorDefinitions		"$BASE;_RETAIL"		[$RETAIL]
+	}
+}
+
+$Configuration "Release"
+{
+	$Compiler
+	{
+		// Pass on appropriate branch define to preprocessor
+		$PreprocessorDefinitions		"VPC"
+		$PreprocessorDefinitions		"$BASE;STAGING_ONLY" [$STAGING_ONLY]
+		$PreprocessorDefinitions		"$BASE;TF_BETA" [$TF_BETA]
+		$PreprocessorDefinitions		"$BASE;RAD_TELEMETRY_DISABLED" [$SOURCESDK]
+// Need to revisit the code to make things run with the _RETAIL preprocessor definition
+// This line was added in the previous check-in, but had previously not been defined in this branch
+//		$PreprocessorDefinitions		"$BASE;_RETAIL"		[$RETAIL]
+	}
+}