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

Introjucer: added 10.7 SDK target and tidied up some 64-bit AU build settings.

Browse source
This commit is contained in:
jules 2012-02-13 22:02:23 +00:00
parent d12fa83a7e
commit 2b311a410f
5 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@ namespace
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 char* const osxArch_Default = "default";
const char* const osxArch_Native = "Native";
@ -181,8 +182,8 @@ protected:
if (getMacSDKVersion().toString().isEmpty())
getMacSDKVersion() = osxVersionDefault;
const char* osxVersions[] = { "Use Default", osxVersion10_4, osxVersion10_5, osxVersion10_6, 0 };
const char* osxVersionValues[] = { osxVersionDefault, osxVersion10_4, osxVersion10_5, osxVersion10_6, 0 };
const char* osxVersions[] = { "Use Default", osxVersion10_4, osxVersion10_5, osxVersion10_6, osxVersion10_7, 0 };
const char* osxVersionValues[] = { osxVersionDefault, osxVersion10_4, osxVersion10_5, osxVersion10_6, osxVersion10_7, 0 };
props.add (new ChoicePropertyComponent (getMacSDKVersion(), "OSX Base SDK Version", StringArray (osxVersions), Array<var> (osxVersionValues)),
"The version of OSX to link against in the XCode build.");
@ -602,25 +603,23 @@ private:
const String sdk (config.getMacSDKVersion().toString());
const String sdkCompat (config.getMacCompatibilityVersion().toString());
if (sdk == osxVersion10_4)
{
s.add ("SDKROOT = macosx10.4");
gccVersion = "4.0";
}
else if (sdk == osxVersion10_5)
{
s.add ("SDKROOT = macosx10.5");
}
else if (sdk == osxVersion10_6)
{
s.add ("SDKROOT = macosx10.6");
}
if (sdk == osxVersion10_4) { s.add ("SDKROOT = macosx10.4"); gccVersion = "4.0"; }
else 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");
s.add ("MACOSX_DEPLOYMENT_TARGET_ppc = 10.4");
if (xcodeExcludedFiles64Bit.isNotEmpty())
{
s.add ("EXCLUDED_SOURCE_FILE_NAMES = \"$(EXCLUDED_SOURCE_FILE_NAMES_$(CURRENT_ARCH))\"");
s.add ("EXCLUDED_SOURCE_FILE_NAMES_x86_64 = " + xcodeExcludedFiles64Bit);
}
}
s.add ("GCC_VERSION = " + gccVersion);

1
extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h
View file

@ -123,6 +123,7 @@ public:
String xcodePackageType, xcodeBundleSignature, xcodeBundleExtension;
String xcodeProductType, xcodeProductInstallPath, xcodeFileType;
String xcodeShellScript, xcodeShellScriptTitle, xcodeOtherRezFlags;
String xcodeExcludedFiles64Bit;
bool xcodeIsBundle, xcodeCreatePList, xcodeCanUseDwarf;
StringArray xcodeFrameworks;
Array<RelativePath> xcodeExtraLibrariesDebug, xcodeExtraLibrariesRelease;

1
extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
View file

@ -354,6 +354,7 @@ namespace AUHelpers
exporter.extraSearchPaths.add ("$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility");
exporter.xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false);
exporter.xcodeExcludedFiles64Bit = "\"*Carbon*.cpp\"";
Project::Item subGroup (projectSaver.getGeneratedCodeGroup().addNewSubGroup ("Juce AU Wrapper", -1));
subGroup.setID ("__juceappleaufiles");

4
extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj
View file

@ -1860,6 +1860,8 @@
GENERATE_PKGINFO_FILE = YES;
OTHER_REZFLAGS = "-d ppc_$ppc -d i386_$i386 -d ppc64_$ppc64 -d x86_64_$x86_64 -I /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers -I \"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\"";
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
EXCLUDED_SOURCE_FILE_NAMES = "$(EXCLUDED_SOURCE_FILE_NAMES_$(CURRENT_ARCH))";
EXCLUDED_SOURCE_FILE_NAMES_x86_64 = "*Carbon*.cpp";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
OTHER_LDFLAGS = "-bundle";
@ -1881,6 +1883,8 @@
GENERATE_PKGINFO_FILE = YES;
OTHER_REZFLAGS = "-d ppc_$ppc -d i386_$i386 -d ppc64_$ppc64 -d x86_64_$x86_64 -I /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers -I \"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\"";
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
EXCLUDED_SOURCE_FILE_NAMES = "$(EXCLUDED_SOURCE_FILE_NAMES_$(CURRENT_ARCH))";
EXCLUDED_SOURCE_FILE_NAMES_x86_64 = "*Carbon*.cpp";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
OTHER_LDFLAGS = "-bundle";

2
modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
View file

@ -281,7 +281,7 @@ public:
NSString* bundlePath = [NSString stringWithUTF8String: (const char*) bundleFile.getFullPathName().toUTF8()];
NSBundle* b = [NSBundle bundleWithPath: bundlePath];
info->mCocoaAUViewClass[0] = (CFStringRef) [[[JuceUICreationClass class] className] retain];
info->mCocoaAUViewClass[0] = (CFStringRef) [NSStringFromClass ([JuceUICreationClass class]) retain];
info->mCocoaAUViewBundleLocation = (CFURLRef) [[NSURL fileURLWithPath: [b bundlePath]] retain];
return noErr;