mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-03 03:30:06 +00:00
Code Activity

Introjucer: updated list of OSX SDK versions.

Browse source
This commit is contained in:
jules 2013-09-20 10:08:54 +01:00
parent ffa367a3eb
commit f887803358
1 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

44
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h
View file

@ -25,10 +25,8 @@
namespace
{
const char* const osxVersionDefault = "default";
const char* const osxVersion10_4 = "10.4 SDK";
const char* const osxVersion10_5 = "10.5 SDK";
const char* const osxVersion10_6 = "10.6 SDK";
const char* const osxVersion10_7 = "10.7 SDK";
const int oldestSDKVersion = 4;
const int currentSDKVersion = 9;
const char* const osxArch_Default = "default";
const char* const osxArch_Native = "Native";
@ -210,15 +208,22 @@ protected:
}
else
{
const char* osxVersions[] = { "Use Default", osxVersion10_5, osxVersion10_6, osxVersion10_7, 0 };
const char* osxVersionValues[] = { osxVersionDefault, osxVersion10_5, osxVersion10_6, osxVersion10_7, 0 };
StringArray versionNames;
Array<var> versionValues;
props.add (new ChoicePropertyComponent (getMacSDKVersionValue(), "OSX Base SDK Version",
StringArray (osxVersions), Array<var> (osxVersionValues)),
versionNames.add ("Use Default");
versionValues.add (osxVersionDefault);
for (int ver = oldestSDKVersion; ver <= currentSDKVersion; ++ver)
{
versionNames.add (getSDKName (ver));
versionValues.add (getSDKName (ver));
}
props.add (new ChoicePropertyComponent (getMacSDKVersionValue(), "OSX Base SDK Version", versionNames, versionValues),
"The version of OSX to link against in the XCode build.");
props.add (new ChoicePropertyComponent (getMacCompatibilityVersionValue(), "OSX Compatibility Version",
StringArray (osxVersions), Array<var> (osxVersionValues)),
props.add (new ChoicePropertyComponent (getMacCompatibilityVersionValue(), "OSX Compatibility Version", versionNames, versionValues),
"The minimum version of OSX that the target binary will be compatible with.");
const char* osxArch[] = { "Use Default", "Native architecture of build machine",
@ -700,14 +705,11 @@ private:
const String sdk (config.getMacSDKVersion());
const String sdkCompat (config.getMacCompatibilityVersion());
if (sdk == osxVersion10_5) s.add ("SDKROOT = macosx10.5");
else if (sdk == osxVersion10_6) s.add ("SDKROOT = macosx10.6");
else if (sdk == osxVersion10_7) s.add ("SDKROOT = macosx10.7");
if (sdkCompat == osxVersion10_4) s.add ("MACOSX_DEPLOYMENT_TARGET = 10.4");
else if (sdkCompat == osxVersion10_5) s.add ("MACOSX_DEPLOYMENT_TARGET = 10.5");
else if (sdkCompat == osxVersion10_6) s.add ("MACOSX_DEPLOYMENT_TARGET = 10.6");
else if (sdkCompat == osxVersion10_7) s.add ("MACOSX_DEPLOYMENT_TARGET = 10.7");
for (int ver = oldestSDKVersion; ver <= currentSDKVersion; ++ver)
{
if (sdk == getSDKName (ver)) s.add ("SDKROOT = macosx10." + String (ver));
if (sdkCompat == getSDKName (ver)) s.add ("MACOSX_DEPLOYMENT_TARGET = 10." + String (ver));
}
s.add ("MACOSX_DEPLOYMENT_TARGET_ppc = 10.4");
s.add ("SDKROOT_ppc = macosx10.5");
@ -1230,4 +1232,10 @@ private:
{
return file.hasFileExtension (sourceFileExtensions);
}
static String getSDKName (int version)
{
jassert (version >= 4);
return "10." + String (version) + " SDK";
}
};