os tahoe

Signed-off-by: Slice <[email protected]>

Author: SergeySlice

makefile

@@ -2,11 +2,11 @@
 
 Clover:
 	@echo "Building Clover..."
-	@./ebuild.sh -gcc53 -D LESS_DEBUG -D NO_GRUB_DRIVERS_EMBEDDED >/dev/null
+	@./ebuild.sh -gcc131 -D LESS_DEBUG -D NO_GRUB_DRIVERS_EMBEDDED >/dev/null
 	@echo [BUILD] "Clover " $Version.h
 
 clean:
-	@./ebuild.sh -gcc53 -clean >/dev/null
+	@./ebuild.sh -gcc131 -clean >/dev/null
 	@rm -rf build *~
 	@echo [CLEAN] 
 

rEFIt_UEFI/Settings/ConfigPlist/ConfigPlistClass.h

@@ -90,7 +90,7 @@ class ConfigPlistClass : public ConfigPlistAbstractClass
   SmbiosPlistClass::SmbiosDictClass SMBIOS_ventura = SmbiosPlistClass::SmbiosDictClass();
   SmbiosPlistClass::SmbiosDictClass SMBIOS_sonoma = SmbiosPlistClass::SmbiosDictClass();
   SmbiosPlistClass::SmbiosDictClass SMBIOS_sequoia = SmbiosPlistClass::SmbiosDictClass();
-  SmbiosPlistClass::SmbiosDictClass SMBIOS_redwood = SmbiosPlistClass::SmbiosDictClass();
+  SmbiosPlistClass::SmbiosDictClass SMBIOS_tahoe = SmbiosPlistClass::SmbiosDictClass();
 //  SmbiosPlistClass::SmbiosDictClass SMBIOS_lion = SmbiosPlistClass::SmbiosDictClass();
 public:
   SystemParameters_Class SystemParameters = SystemParameters_Class();
@@ -122,7 +122,7 @@ class ConfigPlistClass : public ConfigPlistAbstractClass
     {"SMBIOS_ventura", SMBIOS_ventura},
     {"SMBIOS_sonoma", SMBIOS_sonoma},
     {"SMBIOS_sequoia", SMBIOS_sequoia},
-	{"SMBIOS_redwood", SMBIOS_redwood},
+	{"SMBIOS_tahoe", SMBIOS_tahoe},
     {"SystemParameters", SystemParameters},
     {"RtVariables", RtVariables},
     {"Quirks", Quirks},

rEFIt_UEFI/Settings/ConfigPlist/SMBIOSPlist.h

@@ -762,7 +762,7 @@ class SmbiosPlistClass : public ConfigPlistAbstractClass
   SmbiosDictClass SMBIOS_ventura = SmbiosDictClass();
   SmbiosDictClass SMBIOS_sonoma = SmbiosDictClass();
   SmbiosDictClass SMBIOS_sequoia = SmbiosDictClass();
-  SmbiosDictClass SMBIOS_redwood = SmbiosDictClass();
+  SmbiosDictClass SMBIOS_tahoe = SmbiosDictClass();
 
   XmlDictField m_fields[16] = {
     {"SMBIOS", SMBIOS},
@@ -780,7 +780,7 @@ class SmbiosPlistClass : public ConfigPlistAbstractClass
     {"SMBIOS_ventura", SMBIOS_ventura},
     {"SMBIOS_sonoma", SMBIOS_sonoma},
     {"SMBIOS_sequoia", SMBIOS_sequoia},
-	{"SMBIOS_redwood", SMBIOS_redwood},
+	{"SMBIOS_tahoe", SMBIOS_tahoe},
   };
 
 public:

rEFIt_UEFI/entry_scan/loader.cpp

@@ -589,8 +589,9 @@ MacOsVersion GetOSVersion(int LoaderType, const EFI_GUID& APFSTargetUUID, const
                 OSVersion = "14"_XS8;
               } else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Sequoia") || Prop->getString()->stringValue().contains("Install%20macOS%2015")) {
                 OSVersion = "15"_XS8;
-              } else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Redwood") || Prop->getString()->stringValue().contains("Install%20macOS%2016")) {
-                OSVersion = "16"_XS8;
+              } else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Tahoe") || Prop->getString()->stringValue().contains("Install%20macOS%2016") ||
+            		  Prop->getString()->stringValue().contains("Install%20macOS%2026")) {
+                OSVersion = "26"_XS8;
               } else if ( Prop->getString()->stringValue().contains("Install%20macOS%2010.16")) {
                 OSVersion = "10.16"_XS8;
               } else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Catalina") || Prop->getString()->stringValue().contains("Install%20macOS%2010.15")) {
@@ -843,9 +844,9 @@ GetOSIconName (const MacOsVersion& OSVersion)
   XStringW OSIconName;
   if (OSVersion.isEmpty()) {
     OSIconName = L"mac"_XSW;
-  } else if (OSVersion.elementAt(0) == 16 ){
-    // Redwood
-    OSIconName = L"redwood,mac"_XSW;
+  } else if (OSVersion.elementAt(0) == 16 || OSVersion.elementAt(0) == 26){
+    // Tahoe
+    OSIconName = L"tahoe,mac"_XSW;
   } else if (OSVersion.elementAt(0) == 15 ){
     // Sequoia
     OSIconName = L"sequoia,mac"_XSW;

rEFIt_UEFI/libeg/XIcon.cpp

@@ -87,7 +87,7 @@ CONST LString8 IconsNames[] = {
    "os_ventura",  //55 == ICON_VENTURA
    "os_sonoma",  //56 == ICON_SONOMA
    "os_sequoia",  //57 == ICON_SEQUOIA
-   "os_redwood",  //58 == ICON_SONOMA
+   "os_tahoe",  //58 == ICON_TAHOE
   ""
 };
 const INTN IconsNamesSize = sizeof(IconsNames) / sizeof(IconsNames[0]);

rEFIt_UEFI/refit/lib.h

@@ -365,7 +365,7 @@ void DebugPause(void);
 #define ICON_VENTURA                           (55)
 #define ICON_SONOMA                            (56)
 #define ICON_SEQUOIA                           (57)
-#define ICON_REDWOOD                           (58)
+#define ICON_TAHOE		                       (58)
 #define BUILTIN_ICON_BACKGROUND                (100)
 #define BUILTIN_ICON_SELECTION                 (101)
 #define BUILTIN_ICON_ANIME                     (102)

rEFIt_UEFI/refit/main.cpp

@@ -1587,7 +1587,9 @@ void LOADER_ENTRY::StartLoader()
               strncmp(InstallerVersion, "12.", 3) &&
               strncmp(InstallerVersion, "13.", 3) &&
               strncmp(InstallerVersion, "14.", 3) &&
-              strncmp(InstallerVersion, "15.", 3)
+			  strncmp(InstallerVersion, "15.", 3) &&
+			  strncmp(InstallerVersion, "16.", 3) &&
+              strncmp(InstallerVersion, "26.", 3)
               ) {
             InstallerVersion = NULL; // flag known version was not found
           }