From 49c4f0c0f30ef4992d9dc6d5ee6e283a6ed205ec Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 5 Apr 2018 13:00:42 +0100 Subject: [PATCH] Projucer: Don't set the OSX SDK version if using default --- .../Source/ProjectSaving/jucer_ProjectExport_Xcode.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index d62b3b92ad..d37049a33a 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -516,8 +516,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(); } @@ -1668,8 +1674,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;