Fix build errors...

milkytracker · Dec 30, 2024 · efa05f5 · efa05f5
1 parent c527c59
commit efa05f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/ppui/CMakeLists.txt b/src/ppui/CMakeLists.txt
@@ -104,13 +104,10 @@ add_library(ppui STATIC
 
 target_include_directories(ppui
     PUBLIC
-        .
-    PRIVATE
-        osinterface
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/osinterface
 )
 
-target_link_libraries(ppui PRIVATE osinterface)
-
 # Add platform-specific sources and include paths
 if(APPLE)
     target_sources(ppui
@@ -123,6 +120,7 @@ if(APPLE)
             ${PROJECT_SOURCE_DIR}/src/tracker/cocoa
         PUBLIC
             cocoa
+            ${CMAKE_CURRENT_SOURCE_DIR}/osinterface/posix
     )
 elseif(WIN32)
     target_sources(ppui

diff --git a/src/ppui/osinterface/CMakeLists.txt b/src/ppui/osinterface/CMakeLists.txt
@@ -59,7 +59,17 @@ if(APPLE)
             posix/PPSystemString_POSIX.h
             posix/PPSystem_POSIX.h
     )
-    target_include_directories(osinterface PUBLIC posix)
+    target_include_directories(osinterface 
+        PUBLIC 
+            posix
+            ${PROJECT_SOURCE_DIR}/src/tracker/cocoa
+    )
+
+    # Link against Cocoa framework and make osinterface PUBLIC
+    target_link_libraries(osinterface 
+        PUBLIC 
+            "-framework Cocoa"
+    )
 elseif(WIN32)
     target_sources(osinterface
         PRIVATE

diff --git a/src/tools/export-to-wav/CMakeLists.txt b/src/tools/export-to-wav/CMakeLists.txt
@@ -7,6 +7,7 @@ add_executable(export-to-wav
 target_link_libraries(export-to-wav PRIVATE
     trackerlib
     compression
+    osinterface
     ${LHASA_LIBRARIES}
     ${ZZIPLIB_LIBRARIES}
     ${ZLIB_LIBRARIES}

diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
@@ -163,6 +163,7 @@ target_include_directories(tracker
 target_link_libraries(tracker
     fx
     trackerlib
+    osinterface
 )
 
 if(CMAKE_VERSION GREATER_EQUAL 3.12)