From 8b88fd759428c596a5fd0f4c132500f2d3ccf00e Mon Sep 17 00:00:00 2001
From: Tom Poole <thomas.poole@roli.com>
Date: Thu, 24 Oct 2019 17:32:13 +0100
Subject: [PATCH] Projucer:  Fixed an issue setting MacOS base SDKs and
 deployment targets

---
 .../ProjectSaving/jucer_ProjectExport_Xcode.h | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
index 1764dcaae7..791ed5048c 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
@@ -46,6 +46,15 @@ namespace
     static String getSDKDisplayName (int version)  { return getVersionName (version) + " SDK"; }
     static String getSDKRootName    (int version)  { return "macosx" + getVersionName (version); }
 
+    static String getOSXSDKVersion (const String& sdkVersion)
+    {
+        for (int v = oldestSDKVersion; v <= currentSDKVersion; ++v)
+            if (sdkVersion == getSDKDisplayName (v))
+                return getSDKRootName (v);
+
+        return {};
+    }
+
     template<class ContainerType>
     static ContainerType getSDKChoiceList (int oldestVersion, bool displayName)
     {
@@ -1331,11 +1340,6 @@ public:
             else
             {
                 s.set ("MACOSX_DEPLOYMENT_TARGET", getOSXDeploymentTarget (config.getOSXDeploymentTargetString()));
-
-                auto sdkRoot = getOSXSDKVersion (config.getOSXSDKVersionString());
-
-                if (sdkRoot.isNotEmpty())
-                    s.set ("SDKROOT", sdkRoot);
             }
 
             s.set ("GCC_VERSION", gccVersion);
@@ -1934,15 +1938,6 @@ public:
             return getVersionName (minVersion);
         }
 
-        String getOSXSDKVersion (const String& sdkVersion) const
-        {
-            for (int v = oldestSDKVersion; v <= currentSDKVersion; ++v)
-                if (sdkVersion == getSDKDisplayName (v))
-                    return getSDKRootName (v);
-
-            return {};
-        }
-
         //==============================================================================
         const XcodeProjectExporter& owner;
 
@@ -2617,6 +2612,13 @@ private:
             s.set ("TARGETED_DEVICE_FAMILY", getDeviceFamilyString().quoted());
             s.set ("IPHONEOS_DEPLOYMENT_TARGET", config.getiOSDeploymentTargetString());
         }
+        else
+        {
+            auto sdkRoot = getOSXSDKVersion (config.getOSXSDKVersionString());
+
+            if (sdkRoot.isNotEmpty())
+                s.set ("SDKROOT", sdkRoot);
+        }
 
         s.set ("ZERO_LINK", "NO");