Browse Source

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

tags/2021-05-28
ed 7 years ago
parent
commit
5cb7e920ee
1 changed files with 9 additions and 3 deletions
  1. +9
    -3
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h

+ 9
- 3
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;


Loading…
Cancel
Save