mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-03 03:30:06 +00:00
Code Activity

Projucer: Better setting of the default macOS SDK value

Browse source
This commit is contained in:
Tom Poole 2020-01-02 13:30:27 +00:00
parent f402a3fc08
commit b5f1beef7f
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ namespace
if (sdkVersion == getSDKDisplayName (v))
return getSDKRootName (v);
return {};
return "macosx";
}
template<class ContainerType>
@ -674,8 +674,7 @@ protected:
{
props.add (new ChoicePropertyComponent (osxSDKVersion, "OSX Base SDK Version", getSDKChoiceList<StringArray> (oldestSDKVersion, true),
getSDKChoiceList<Array<var>> (oldestSDKVersion, true)),
"The version of OSX to link against in the Xcode build. If \"Default\" is selected then the field will be left "
"empty and the Xcode default will be used.");
"The version of the macOS SDK to link against. If \"Default\" is selected then the Xcode default will be used.");
props.add (new ChoicePropertyComponent (osxDeploymentTarget, "OSX Deployment Target", getSDKChoiceList<StringArray> (oldestDeploymentTarget, false),
getSDKChoiceList<Array<var>> (oldestDeploymentTarget, true)),
@ -1210,11 +1209,7 @@ public:
// the aggregate target needs to have the deployment target set for
// pre-/post-build scripts
s.set ("MACOSX_DEPLOYMENT_TARGET", getOSXDeploymentTarget (config.getOSXDeploymentTargetString()));
auto sdkRoot = getOSXSDKVersion (config.getOSXSDKVersionString());
if (sdkRoot.isNotEmpty())
s.set ("SDKROOT", sdkRoot);
s.set ("SDKROOT", getOSXSDKVersion (config.getOSXSDKVersionString()));
return s;
}
@ -2620,10 +2615,7 @@ private:
}
else
{
auto sdkRoot = getOSXSDKVersion (config.getOSXSDKVersionString());
if (sdkRoot.isNotEmpty())
s.set ("SDKROOT", sdkRoot);
s.set ("SDKROOT", getOSXSDKVersion (config.getOSXSDKVersionString()));
}
s.set ("ZERO_LINK", "NO");