summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2020-08-27 03:47:41 -0700
committerShawn Hoffman <godisgovernment@gmail.com>2020-08-27 15:15:52 -0700
commit8068ff92bfc363379f35bb3fea6e76c5bf9513fd (patch)
treea78ac49e4cb0f823ed72877c58cfc897716ba33b /Source
parent9888adad54d554d12b2e65fab541d7a798547857 (diff)
msbuild: use x64-hosted toolchain
Diffstat (limited to 'Source')
-rw-r--r--Source/VSProps/Base.props6
-rw-r--r--Source/VSProps/Configuration.Base.props2
2 files changed, 1 insertions, 7 deletions
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index f9a619f9b1..ab8e22a8e2 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -2,12 +2,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Base.Macros.props" Condition="'$(BaseMacrosImported)'==''" />
<PropertyGroup>
- <!--
- Opt-in to x64 compiler and tools.
- Unfortunately we can't set this property here, as it'll be overridden later. Instead, set it
- from commandline if you're interested in using x64 toolset
- <PreferredToolArchitecture>x64</PreferredToolArchitecture>
- -->
<IntDir>$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(IntDir)bin\</OutDir>
<TargetName Condition="'$(ConfigurationType)'=='Application'">$(ProjectName)$(TargetSuffix)</TargetName>
diff --git a/Source/VSProps/Configuration.Base.props b/Source/VSProps/Configuration.Base.props
index 30c800ce44..dfbeedf4de 100644
--- a/Source/VSProps/Configuration.Base.props
+++ b/Source/VSProps/Configuration.Base.props
@@ -3,7 +3,7 @@
<PropertyGroup Label="Configuration">
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
- <!--<EnableASAN>true</EnableASAN>-->
+ <PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>