From 96f1fb43c104efd436bb1a6a77e7e6e2ddf463d2 Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 5 Apr 2018 14:38:16 +0100 Subject: [PATCH] Projucer: Clarified the OSX base SDK version that will be used if the "Default" option is selected --- .../ProjectSaving/jucer_ProjectExport_Xcode.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index ac6d14296b..980d3fb55d 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -415,7 +415,7 @@ protected: XcodeBuildConfiguration (Project& p, const ValueTree& t, const bool isIOS, const ProjectExporter& e) : BuildConfiguration (p, t, e), iOS (isIOS), - osxSDKVersion (config, Ids::osxSDK, getUndoManager(), String (osxVersionDefault) + " SDK"), + osxSDKVersion (config, Ids::osxSDK, getUndoManager()), osxDeploymentTarget (config, Ids::osxCompatibility, getUndoManager(), String (osxVersionDefault) + " SDK"), iosDeploymentTarget (config, Ids::iosCompatibility, getUndoManager(), iosVersionDefault), osxArchitecture (config, Ids::osxArchitecture, getUndoManager(), osxArch_Default), @@ -467,7 +467,8 @@ protected: } props.add (new ChoicePropertyComponent (osxSDKVersion, "OSX Base SDK Version", sdkVersionNames, versionValues), - "The version of OSX to link against in the Xcode build."); + "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."); props.add (new ChoicePropertyComponent (osxDeploymentTarget, "OSX Deployment Target", osxVersionNames, versionValues), "The minimum version of OSX that the target binary will be compatible with."); @@ -511,14 +512,8 @@ 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(); }