From 47a0bb0fde50b41b3b089ef0eda3ff2aa061a85d Mon Sep 17 00:00:00 2001 From: Blixibon Date: Sat, 6 Nov 2021 15:29:48 -0500 Subject: [PATCH] Moved toolset conditionals to a more fitting and intuitive place --- sp/src/vpc_scripts/default.vgc | 15 +++++++++++++++ sp/src/vpc_scripts/source_base.vpc | 12 ------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/sp/src/vpc_scripts/default.vgc b/sp/src/vpc_scripts/default.vgc index efcaedfb..e08fa894 100644 --- a/sp/src/vpc_scripts/default.vgc +++ b/sp/src/vpc_scripts/default.vgc @@ -17,6 +17,21 @@ $Games // Makes the VPC scripts work in the SDK's context $Conditional "SOURCESDK" "1" +//----------------------------------------------------------------------------- + +// Mapbase - Additional toolsets (NOTE: Newer toolsets make the solution incompatible with Visual Studio 2013) + +$Conditional VS2019 "0" // Toggles Visual Studio 2019 (v142) toolset + +// +// Note that the following projects currently do not compile with v142 and are not included in the VS2019 solution: +// +// - phonemeextractor (may be fixable with modification) +// - qc_eyes (might be fixed by having C++ MFC for v141 build tools and/or C++ ATL for v141 build tools installed) +// + +//----------------------------------------------------------------------------- + $Include "vpc_scripts\projects.vgc" $Include "vpc_scripts\groups.vgc" diff --git a/sp/src/vpc_scripts/source_base.vpc b/sp/src/vpc_scripts/source_base.vpc index 3322bcdc..fac51e1d 100644 --- a/sp/src/vpc_scripts/source_base.vpc +++ b/sp/src/vpc_scripts/source_base.vpc @@ -17,18 +17,6 @@ //----------------------------------------------------------------------------- -// Mapbase - Additional toolsets (NOTE: Newer toolsets make the solution incompatible with Visual Studio 2013) -$Conditional VS2019 "0" // Toggles Visual Studio 2019 (v142) toolset - -// -// Note that the following projects currently do not compile with v142 and are not included in the VS2019 solution: -// -// - phonemeextractor (may be fixable with modification) -// - qc_eyes (might be fixed by having C++ MFC for v141 build tools and/or C++ ATL for v141 build tools installed) -// - -//----------------------------------------------------------------------------- - // Mapbase functionality conditionals $Conditional MAPBASE "1" // Equivalent to (and required for) our MAPBASE preprocessor defined below $Conditional MAPBASE_RPC "1" // Toggles Mapbase's Rich Presence Client implementations