mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Fixed an issue setting MacOS base SDKs and deployment targets

Browse source
This commit is contained in:
Tom Poole 2019-10-24 17:32:13 +01:00
parent 65be5bc9c5
commit 8b88fd7594
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
View file

@ -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");