Another fix for mac.

HarbourMasters · Dec 24, 2024 · a753504 · a753504
1 parent ef26c9e
commit a753504
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/CMake/FindOpusFile.cmake b/CMake/FindOpusFile.cmake
@@ -9,26 +9,38 @@
 # Search for the OpusFile header
 find_path(OPUSFILE_INCLUDE_DIR
     NAMES opusfile.h
-    PATHS /usr/include/opus /usr/local/include/opus
+    PATHS
+        /opt/local/include
+        /usr/include
+        /usr/local/include
     DOC "Directory where opusfile.h is located"
 )
 
-# Search for the OpusFile library
 find_library(OPUSFILE_LIBRARY
     NAMES opusfile
+    PATHS
+        /opt/local/lib
+        /usr/lib
+        /usr/local/lib
     DOC "Path to the libopusfile library"
 )
 
-# Search for the Opus library (dependency of OpusFile)
 find_library(OPUS_LIBRARY
     NAMES opus
-    DOC "Path to the libopus library (dependency of libopusfile)"
+    PATHS
+        /opt/local/lib
+        /usr/lib
+        /usr/local/lib
+    DOC "Path to the libopus library"
 )
 
-# Search for the Ogg library (dependency of OpusFile)
 find_library(OGG_LIBRARY
     NAMES ogg
-    DOC "Path to the libogg library (dependency of libopusfile)"
+    PATHS
+        /opt/local/lib
+        /usr/lib
+        /usr/local/lib
+    DOC "Path to the libogg library"
 )
 
 # Check if all required components are found

diff --git a/mm/CMakeLists.txt b/mm/CMakeLists.txt
@@ -630,7 +630,7 @@ else()
     find_package(Ogg REQUIRED)
     find_package(Vorbis REQUIRED)
     find_package(Opus REQUIRED)
-    find_package(OpusFile CONFIG REQUIRED)
+    find_package(OpusFile REQUIRED)
     set(ADDITIONAL_LIBRARY_DEPENDENCIES
         "libultraship;"
 		"ZAPDLib;"