diff options
| author | Jørgen P. Tjernø <[email protected]> | 2013-12-02 19:31:46 -0800 |
|---|---|---|
| committer | Jørgen P. Tjernø <[email protected]> | 2013-12-02 19:46:31 -0800 |
| commit | f56bb35301836e56582a575a75864392a0177875 (patch) | |
| tree | de61ddd39de3e7df52759711950b4c288592f0dc /sp/src/vpc_scripts/source_base.vpc | |
| parent | Mark some more files as text. (diff) | |
| download | source-sdk-2013-f56bb35301836e56582a575a75864392a0177875.tar.xz source-sdk-2013-f56bb35301836e56582a575a75864392a0177875.zip | |
Fix line endings. WHAMMY.
Diffstat (limited to 'sp/src/vpc_scripts/source_base.vpc')
| -rw-r--r-- | sp/src/vpc_scripts/source_base.vpc | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/sp/src/vpc_scripts/source_base.vpc b/sp/src/vpc_scripts/source_base.vpc index 86722a3a..17de60eb 100644 --- a/sp/src/vpc_scripts/source_base.vpc +++ b/sp/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] + } +} |