From 2fde99f4cf51bfe1a1da05498584ad75530f3183 Mon Sep 17 00:00:00 2001
From: Steve Vermeulen <sfvermeulen@gmail.com>
Date: Wed, 24 May 2017 11:09:55 -0400
Subject: [PATCH] Changed to not complain when changing between 64 bit and 32
 bit windows and also added an option to default to 64 bit  (re issue #61)

---
 Source/mtm/util/UnityHelper.py                     | 3 +++
 UnityPlugin/Projeny/Main/PrjInterface.cs           | 1 +
 UnityPlugin/Projeny/Main/ProjenyConfigValidator.cs | 9 ++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Source/mtm/util/UnityHelper.py b/Source/mtm/util/UnityHelper.py
index f1284f3b..00d93f0b 100644
--- a/Source/mtm/util/UnityHelper.py
+++ b/Source/mtm/util/UnityHelper.py
@@ -28,6 +28,7 @@ class UnityHelper:
     _sys = Inject('SystemHelper')
     _varMgr = Inject('VarManager')
     _commonSettings = Inject('CommonSettings')
+    _config = Inject('Config')
 
     def __init__(self):
         pass
@@ -56,6 +57,8 @@ def openUnity(self, projectName, platform):
     def _getBuildTargetArg(self, platform):
 
         if platform == Platforms.Windows:
+            if self._config.tryGetBool(False, 'Unity', 'Win64IsDefault'):
+                return 'win64'
             return 'win32'
 
         if platform == Platforms.WebPlayer:
diff --git a/UnityPlugin/Projeny/Main/PrjInterface.cs b/UnityPlugin/Projeny/Main/PrjInterface.cs
index dcd757e9..6fb0f070 100644
--- a/UnityPlugin/Projeny/Main/PrjInterface.cs
+++ b/UnityPlugin/Projeny/Main/PrjInterface.cs
@@ -288,6 +288,7 @@ static string ToPlatformDirStr(BuildTarget platform)
         {
             switch (platform)
             {
+                case BuildTarget.StandaloneWindows64:
                 case BuildTarget.StandaloneWindows:
                 {
                     return "windows";
diff --git a/UnityPlugin/Projeny/Main/ProjenyConfigValidator.cs b/UnityPlugin/Projeny/Main/ProjenyConfigValidator.cs
index 70a8111b..9cf546d9 100644
--- a/UnityPlugin/Projeny/Main/ProjenyConfigValidator.cs
+++ b/UnityPlugin/Projeny/Main/ProjenyConfigValidator.cs
@@ -32,8 +32,15 @@ static void VerifyPlatformIsCorrect()
             var info = ProjenyEditorUtil.GetCurrentProjectInfo();
 
             var expectedPlatform = ProjenyEditorUtil.FromPlatformDirStr(info.PlatformDirName);
+            var currentPlatform = EditorUserBuildSettings.activeBuildTarget;
 
-            if (EditorUserBuildSettings.activeBuildTarget != expectedPlatform)
+            if ((expectedPlatform == BuildTarget.StandaloneWindows || expectedPlatform == BuildTarget.StandaloneWindows64)
+                && (currentPlatform == BuildTarget.StandaloneWindows || currentPlatform == BuildTarget.StandaloneWindows64))
+            {
+                return;
+            }
+
+            if (currentPlatform != expectedPlatform)
             {
                 if (EditorUserBuildSettings.SwitchActiveBuildTarget(expectedPlatform))
                 {