mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-19 01:04:20 +00:00
Code Activity

Projucer: Don't set the OSX SDK version if using default

Browse source
This commit is contained in:
ed 2018-04-05 13:00:42 +01:00
parent 0f9a0e8c7a
commit 5cb7e920ee
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -511,8 +511,14 @@ protected:
String getCustomXcodeFlagsString() const { return customXcodeFlags.get(); }
String getOSXSDKVersionString() const { return osxSDKVersion.get(); }
String getOSXDeploymentTargetString() const { return osxDeploymentTarget.get(); }
String getOSXSDKVersionString() const
{
if (osxSDKVersion.isUsingDefault())
return {};
return osxSDKVersion.get();
}
String getCodeSignIdentityString() const { return codeSignIdentity.get(); }
bool isUsingDefaultCodeSignIdentity() const { return codeSignIdentity.isUsingDefault(); }
@ -1643,8 +1649,8 @@ public:
for (int ver = oldestAllowedDeploymentTarget; ver <= currentSDKVersion; ++ver)
{
if (sdk == getSDKName (ver) && sdkRoot != nullptr) *sdkRoot = String ("macosx10." + String (ver));
if (sdkCompat == getSDKName (ver)) deploymentTarget = "10." + String (ver);
if (sdk.isNotEmpty() && (sdk == getSDKName (ver) && sdkRoot != nullptr)) *sdkRoot = String ("macosx10." + String (ver));
if (sdkCompat == getSDKName (ver)) deploymentTarget = "10." + String (ver);
}
return deploymentTarget;