From a0c29e7dd67abb15c74c85f07741784877edfdcd Mon Sep 17 00:00:00 2001 From: Joe Ludwig 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. --- mp/src/vpc_scripts/source_base.vpc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'mp/src/vpc_scripts/source_base.vpc') diff --git a/mp/src/vpc_scripts/source_base.vpc b/mp/src/vpc_scripts/source_base.vpc index fc70c2e5..86722a3a 100644 --- a/mp/src/vpc_scripts/source_base.vpc +++ b/mp/src/vpc_scripts/source_base.vpc @@ -15,3 +15,32 @@ // 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] + } +} -- cgit v1.2.3 From f56bb35301836e56582a575a75864392a0177875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Mon, 2 Dec 2013 19:31:46 -0800 Subject: Fix line endings. WHAMMY. --- mp/src/vpc_scripts/source_base.vpc | 92 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'mp/src/vpc_scripts/source_base.vpc') diff --git a/mp/src/vpc_scripts/source_base.vpc b/mp/src/vpc_scripts/source_base.vpc index 86722a3a..17de60eb 100644 --- a/mp/src/vpc_scripts/source_base.vpc +++ b/mp/src/vpc_scripts/source_base.vpc @@ -1,46 +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" - -$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] - } -} +//----------------------------------------------------------------------------- +// 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] + } +} -- cgit v1.2.3