Merge pull request #10912 from shuffle2/msbuild-arch

msbuild: set PreferredToolArchitecture based on host OS arch
dolphin-emu · Jul 31, 2022 · 2c754db · 2c754db
2 parents 45f8ae6 + e85da16
commit 2c754db
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/VSProps/Configuration.Base.props b/Source/VSProps/Configuration.Base.props
@@ -3,7 +3,8 @@
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+    <PreferredToolArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='x64'">x64</PreferredToolArchitecture>
+    <PreferredToolArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='ARM64'">ARM64</PreferredToolArchitecture>
     <!-- To use ASAN, just uncomment this. For simplicity, you should run VS/windbg/etc
     (including the built executables themselves) after using vcvarsall or similar to setup
     environment, as ASAN needs access to libs and executables in the toolchain paths.