exclude OcAudio from subproject

Signed-off-by: Slice <[email protected]>
CloverHackyColor · Jan 19, 2024 · 76704c3 · asepms92 · Jan 20, 2024 · 76704c3
2 parents 00e4d65 + 7e9c25b
commit 76704c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Library/OcMainLib/OcMainLibClover.inf b/Library/OcMainLib/OcMainLibClover.inf
@@ -29,7 +29,7 @@
   OpenCoreNvram.c
   OpenCorePlatform.c
   OpenCoreUefi.c
-  OpenCoreUefiAudio.c
+#  OpenCoreUefiAudio.c
   OpenCoreUefiInOut.c
   OpenCoreVault.c
 

diff --git a/Library/OcMainLib/OpenCoreUefi.c b/Library/OcMainLib/OpenCoreUefi.c
@@ -391,6 +391,7 @@ OcReinstallProtocols (
   BOOLEAN      OverrideAppleEvent;
 
 
+#ifndef CLOVER_BUILD
   if (OcAudioInstallProtocols (
         Config->Uefi.ProtocolOverrides.AppleAudio,
         Config->Uefi.Audio.DisconnectHda
@@ -399,6 +400,7 @@ OcReinstallProtocols (
     DEBUG ((DEBUG_INFO, "OC: Disabling audio in favour of firmware implementation\n"));
   }
 #endif
+
   if (OcAppleBootPolicyInstallProtocol (Config->Uefi.ProtocolOverrides.AppleBootPolicy) == NULL) {
     DEBUG ((DEBUG_INFO, "OC: Failed to install boot policy protocol\n"));
   }
@@ -1051,9 +1053,17 @@ OcLoadUefiSupport (
   }
 
   OcLoadUefiOutputSupport (Storage, Config);
+<<<<<<< HEAD
 #ifndef CLOVER_BUILD
   OcLoadUefiAudioSupport (Storage, Config);
 #endif
+=======
+
+#ifndef CLOVER_BUILD
+  OcLoadUefiAudioSupport (Storage, Config);
+#endif
+
+>>>>>>> 7e9c25b7f5786ebb7a6d833ab5b756329a48f60f
   gBS->CreateEvent (
          EVT_SIGNAL_EXIT_BOOT_SERVICES,
          TPL_CALLBACK,