From 3fa0433c9862d1922cd0540848d2bd8716934d1f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 2 Apr 2021 21:30:55 -0400
Subject: add initial support for 64-bit Windows hack (#767)

---
 build/common.targets | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'build/common.targets')

diff --git a/build/common.targets b/build/common.targets
index d680fa74..8137a6f3 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -1,7 +1,4 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="find-game-folder.targets" />
-
   <!--set properties -->
   <PropertyGroup>
     <Version>3.9.5</Version>
@@ -9,9 +6,15 @@
 
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
-    <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);SMAPI_FOR_WINDOWS;SMAPI_FOR_XNA</DefineConstants>
+
+    <!--<DefineConstants>$(DefineConstants);SMAPI_FOR_WINDOWS_64BIT_HACK</DefineConstants>-->
+    <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);SMAPI_FOR_WINDOWS</DefineConstants>
+    <DefineConstants Condition="$(OS) == 'Windows_NT' AND !$(DefineConstants.Contains(SMAPI_FOR_WINDOWS_64BIT_HACK))">$(DefineConstants);SMAPI_FOR_XNA</DefineConstants>
   </PropertyGroup>
 
+  <!--find game folder-->
+  <Import Project="find-game-folder.targets" />
+
   <!-- if game path is invalid, show one user-friendly error instead of a slew of reference errors -->
   <Target Name="ValidateInstallPath" AfterTargets="BeforeBuild">
     <Error Condition="!Exists('$(GamePath)')" Text="Failed to find the game install path automatically. You can specify where to find it; see https://smapi.io/package/custom-game-path." />
@@ -76,5 +79,4 @@
 
   <!-- Somehow this makes Visual Studio for Mac recognise the previous section. Nobody knows why. -->
   <PropertyGroup Condition="'$(RunConfiguration)' == 'Default'" />
-
 </Project>
-- 
cgit