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

Removed the OS X 10.5 and 10.6 deployment target options from the Projucer

Browse source
This commit is contained in:
Tom Poole 2018-04-05 10:23:04 +01:00
parent 26a608306e
commit ba130cdd8c
1 changed files with 5 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ namespace
const char* const osxVersionDefault = "10.11"; const char* const osxVersionDefault = "10.11";
const char* const iosVersionDefault = "9.3"; const char* const iosVersionDefault = "9.3";
const int oldestSDKVersion = 5; const int oldestSDKVersion = 7;
const int currentSDKVersion = 13; const int currentSDKVersion = 13;
const int minimumAUv3SDKVersion = 11; const int minimumAUv3SDKVersion = 11;
@ -421,7 +421,6 @@ protected:
osxArchitecture (config, Ids::osxArchitecture, getUndoManager(), osxArch_Default), osxArchitecture (config, Ids::osxArchitecture, getUndoManager(), osxArch_Default),
customXcodeFlags (config, Ids::customXcodeFlags, getUndoManager()), customXcodeFlags (config, Ids::customXcodeFlags, getUndoManager()),
plistPreprocessorDefinitions (config, Ids::plistPreprocessorDefinitions, getUndoManager()), plistPreprocessorDefinitions (config, Ids::plistPreprocessorDefinitions, getUndoManager()),
cppStandardLibrary (config, Ids::cppLibType, getUndoManager()),
codeSignIdentity (config, Ids::codeSigningIdentity, getUndoManager(), iOS ? "iPhone Developer" : "Mac Developer"), codeSignIdentity (config, Ids::codeSigningIdentity, getUndoManager(), iOS ? "iPhone Developer" : "Mac Developer"),
fastMathEnabled (config, Ids::fastMath, getUndoManager()), fastMathEnabled (config, Ids::fastMath, getUndoManager()),
stripLocalSymbolsEnabled (config, Ids::stripLocalSymbols, getUndoManager()), stripLocalSymbolsEnabled (config, Ids::stripLocalSymbols, getUndoManager()),
@ -486,11 +485,6 @@ protected:
props.add (new TextPropertyComponent (plistPreprocessorDefinitions, "PList Preprocessor Definitions", 2048, true), props.add (new TextPropertyComponent (plistPreprocessorDefinitions, "PList Preprocessor Definitions", 2048, true),
"Preprocessor definitions used during PList preprocessing (see PList Preprocess)."); "Preprocessor definitions used during PList preprocessing (see PList Preprocess).");
props.add (new ChoicePropertyComponent (cppStandardLibrary, "C++ Library",
{ "LLVM libc++", "GNU libstdc++" },
{ "libc++", "libstdc++" }),
"The type of C++ std lib that will be linked.");
props.add (new TextPropertyComponent (codeSignIdentity, "Code-Signing Identity", 1024, false), props.add (new TextPropertyComponent (codeSignIdentity, "Code-Signing Identity", 1024, false),
"The name of a code-signing identity for Xcode to apply."); "The name of a code-signing identity for Xcode to apply.");
@ -513,8 +507,6 @@ protected:
bool isFastMathEnabled() const { return fastMathEnabled.get(); } bool isFastMathEnabled() const { return fastMathEnabled.get(); }
String getCPPStandardLibraryString() const { return cppStandardLibrary.get(); }
bool isStripLocalSymbolsEnabled() const { return stripLocalSymbolsEnabled.get(); } bool isStripLocalSymbolsEnabled() const { return stripLocalSymbolsEnabled.get(); }
String getCustomXcodeFlagsString() const { return customXcodeFlags.get(); } String getCustomXcodeFlagsString() const { return customXcodeFlags.get(); }
@ -539,7 +531,7 @@ protected:
bool iOS; bool iOS;
ValueWithDefault osxSDKVersion, osxDeploymentTarget, iosDeploymentTarget, osxArchitecture, ValueWithDefault osxSDKVersion, osxDeploymentTarget, iosDeploymentTarget, osxArchitecture,
customXcodeFlags, plistPreprocessorDefinitions, cppStandardLibrary, codeSignIdentity, customXcodeFlags, plistPreprocessorDefinitions, codeSignIdentity,
fastMathEnabled, stripLocalSymbolsEnabled, pluginBinaryCopyStepEnabled, fastMathEnabled, stripLocalSymbolsEnabled, pluginBinaryCopyStepEnabled,
vstBinaryLocation, vst3BinaryLocation, auBinaryLocation, rtasBinaryLocation, aaxBinaryLocation; vstBinaryLocation, vst3BinaryLocation, auBinaryLocation, rtasBinaryLocation, aaxBinaryLocation;
@ -1128,8 +1120,7 @@ public:
: "c++") + cppStandard).quoted()); : "c++") + cppStandard).quoted());
} }
if (config.getCPPStandardLibraryString().isNotEmpty()) s.set ("CLANG_CXX_LIBRARY", "\"libc++\"");
s.set ("CLANG_CXX_LIBRARY", config.getCPPStandardLibraryString().quoted());
s.set ("COMBINE_HIDPI_IMAGES", "YES"); s.set ("COMBINE_HIDPI_IMAGES", "YES");
@ -1576,8 +1567,8 @@ public:
= RelativePath (owner.getAAXPathValue().toString(), RelativePath::projectFolder) = RelativePath (owner.getAAXPathValue().toString(), RelativePath::projectFolder)
.getChildFile ("Libs"); .getChildFile ("Libs");
String libraryPath (config.isDebug() ? "Debug/libAAXLibrary" : "Release/libAAXLibrary"); String libraryPath (config.isDebug() ? "Debug" : "Release");
libraryPath += (isUsingClangCppLibrary (config) ? "_libcpp.a" : ".a"); libraryPath += "/libAAXLibrary_libcpp.a";
extraLibs.add (aaxLibsFolder.getChildFile (libraryPath)); extraLibs.add (aaxLibsFolder.getChildFile (libraryPath));
} }
@ -1638,25 +1629,6 @@ public:
return targetExtraSearchPaths; return targetExtraSearchPaths;
} }
bool isUsingClangCppLibrary (const BuildConfiguration& config) const
{
if (auto xcodeConfig = dynamic_cast<const XcodeBuildConfiguration*> (&config))
{
auto configValue = xcodeConfig->getCPPStandardLibraryString();
if (configValue.isNotEmpty())
return (configValue == "libc++");
auto minorOSXDeploymentTarget = getOSXDeploymentTarget (*xcodeConfig)
.fromLastOccurrenceOf (".", false, false)
.getIntValue();
return (minorOSXDeploymentTarget > 8);
}
return false;
}
String getOSXDeploymentTarget (const XcodeBuildConfiguration& config, String* sdkRoot = nullptr) const String getOSXDeploymentTarget (const XcodeBuildConfiguration& config, String* sdkRoot = nullptr) const
{ {
auto sdk = config.getOSXSDKVersionString() + " SDK"; auto sdk = config.getOSXSDKVersionString() + " SDK";