macOS: Fixed compatibility targeting macOS 10.10 and earlier when bui…

…lding against the 10.15 SDK
juce-framework · Jan 7, 2020 · 997b217 · 997b217
1 parent 2f6053b
commit 997b217
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/extras/Projucer/Source/Project/jucer_Module.cpp b/extras/Projucer/Source/Project/jucer_Module.cpp
@@ -302,7 +302,12 @@ void LibraryModule::addSettingsForModuleToExporter (ProjectExporter& exporter, P
         auto& xcodeExporter = dynamic_cast<XcodeProjectExporter&> (exporter);
 
         if (project.isAUPluginHost())
-            xcodeExporter.xcodeFrameworks.addTokens (xcodeExporter.isOSX() ? "AudioUnit CoreAudioKit" : "CoreAudioKit", false);
+        {
+            xcodeExporter.xcodeFrameworks.add ("CoreAudioKit");
+
+            if (xcodeExporter.isOSX())
+                xcodeExporter.xcodeFrameworks.add ("AudioUnit");
+        }
 
         auto frameworks = moduleInfo.moduleInfo [xcodeExporter.isOSX() ? "OSXFrameworks" : "iOSFrameworks"].toString();
         xcodeExporter.xcodeFrameworks.addTokens (frameworks, ", ", {});

diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
@@ -1772,7 +1772,7 @@ class XcodeProjectExporter  : public ProjectExporter
                                  " -I \\\"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\\\""
                                  " -I \\\"$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AudioUnit.framework/Headers\\\"";
 
-            xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false);
+            xcodeFrameworks.addArray ({ "AudioUnit", "CoreAudioKit" });
 
             XmlElement plistKey ("key");
             plistKey.addTextElement ("AudioComponents");
@@ -1819,10 +1819,10 @@ class XcodeProjectExporter  : public ProjectExporter
 
         void addExtraAudioUnitv3PlugInTargetSettings()
         {
-            if (owner.isiOS())
-                xcodeFrameworks.addTokens ("CoreAudioKit AVFoundation", false);
-            else
-                xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit AVFoundation", false);
+            xcodeFrameworks.addArray ({ "AVFoundation", "CoreAudioKit" });
+
+            if (owner.isOSX())
+                xcodeFrameworks.add ("AudioUnit");
 
             XmlElement plistKey ("key");
             plistKey.addTextElement ("NSExtension");
@@ -2656,6 +2656,16 @@ class XcodeProjectExporter  : public ProjectExporter
             s.removeDuplicates (true);
             s.sort (true);
 
+            // When building against the 10.15 SDK we need to make sure the
+            // AudioUnit framework is linked before the AudioToolbox framework.
+            auto audioUnitIndex = s.indexOf ("AudioUnit", false, 1);
+
+            if (audioUnitIndex != -1)
+            {
+                s.remove (audioUnitIndex);
+                s.insert (0, "AudioUnit");
+            }
+
             for (auto& framework : s)
             {
                 auto frameworkID = addFramework (framework);