- fixed macOS compiler detection not working with Sequioa

christophhart · Oct 19, 2024 · 3e6941c · 3e6941c
1 parent 6c950be
commit 3e6941c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/JUCE/modules/juce_core/native/juce_mac_SystemStats.mm b/JUCE/modules/juce_core/native/juce_mac_SystemStats.mm
@@ -139,6 +139,12 @@ static String getOSXVersion()
         case 12: return MacOS_12;
         case 13: return MacOS_13;
         case 14: return MacOS_14;
+        case 15: return MacOS_15;
+        case 16: return MacOS_16;
+        case 17: return MacOS_17;
+        case 18: return MacOS_18;
+        case 19: return MacOS_19;
+        case 20: return MacOS_20;
     }
 
     return UnknownOS;

diff --git a/JUCE/modules/juce_core/system/juce_SystemStats.h b/JUCE/modules/juce_core/system/juce_SystemStats.h
@@ -66,6 +66,12 @@ class JUCE_API  SystemStats  final
         MacOS_12        = MacOSX | 17,
         MacOS_13        = MacOSX | 18,
         MacOS_14        = MacOSX | 19,
+        MacOS_15        = MacOSX | 20,
+        MacOS_16        = MacOSX | 21,
+        MacOS_17        = MacOSX | 22,
+        MacOS_18        = MacOSX | 23,
+        MacOS_19        = MacOSX | 24,
+        MacOS_20        = MacOSX | 25,
         Win2000         = Windows | 1,
         WinXP           = Windows | 2,
         WinVista        = Windows | 3,

diff --git a/currentGitHash.txt b/currentGitHash.txt
@@ -1 +1 @@
-ec0ea3e4ddf7dd132513dc24a90bc293d1cb83d6
+6c950be05584384464650f03fb864b3743d451c3
diff --git a/hi_backend/backend/CompileExporter.cpp b/hi_backend/backend/CompileExporter.cpp
@@ -1870,10 +1870,10 @@ void CompileExporter::ProjectTemplateHelpers::handleCompilerInfo(CompileExporter
 #if JUCE_MAC
     auto macOSVersion = SystemStats::getOperatingSystemType();
 
-    // deactivate copy step on Sonoma to avoid the cycle dependencies error...
-    if(macOSVersion == SystemStats::MacOS_14)
+    // deactivate copy step on Sonoma (or later) to avoid the cycle dependencies error...
+    if(macOSVersion >= SystemStats::MacOS_14)
     {
-        PresetHandler::showMessageWindow("Copystep diabled", "macOS Sonoma will cause a compile error if the copy step is enabled, so you have to copy the plugin files into the plugin folders manually after compilation");
+        PresetHandler::showMessageWindow("Copystep diabled", "macOS Sonoma (or later) will cause a compile error if the copy step is enabled, so you have to copy the plugin files into the plugin folders manually after compilation");
         copyPlugin = false;
     }
 #endif

diff --git a/hi_backend/backend/currentGit.h b/hi_backend/backend/currentGit.h
@@ -1 +1 @@
-#define PREVIOUS_HISE_COMMIT "ec0ea3e4ddf7dd132513dc24a90bc293d1cb83d6" 
+#define PREVIOUS_HISE_COMMIT "6c950be05584384464650f03fb864b3743d451c3"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ec0ea3e4ddf7dd132513dc24a90bc293d1cb83d6
		6c950be05584384464650f03fb864b3743d451c3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define PREVIOUS_HISE_COMMIT "ec0ea3e4ddf7dd132513dc24a90bc293d1cb83d6"
		#define PREVIOUS_HISE_COMMIT "6c950be05584384464650f03fb864b3743d451c3"