瀏覽代碼

add AAIOLIB to linux rules

richarddobson 2 年之前
父節點
當前提交
03d142712e
共有 1 個文件被更改,包括 10 次插入6 次删除
  1. 10 6
      dev/externals/paprogs/paplay/CMakeLists.txt

+ 10 - 6
dev/externals/paprogs/paplay/CMakeLists.txt

@@ -1,13 +1,17 @@
 if(APPLE)
-  set(CMAKE_C_FLAGS "-O2 -Wall -Dunix -fomit-frame-pointer -funroll-loops")
+#-mmacosx-version-min=10.9
+  set(CMAKE_C_FLAGS "-std=c99 -arch x86_64  -O2 -Wall -Dunix -fomit-frame-pointer -funroll-loops")
   include_directories ( /Developer/Headers/FlatCarbon )
   find_library(COREAUDIOLIB CoreAudio)
   find_library(AUDIOTOOLBOX AudioToolbox)
   find_library(AULIB AudioUnit)
-  find_library(CARBONLIB Carbon)
+  find_library(CARBONLIB Carbon) 
+  find_library(CORESERV CoreServices)
+  link_directories (/Users/Leverhulme/CDP8/CDPr8src/dev/externals/paprogs/portaudio/lib/.libs)
+  find_library(PA NAMES libportaudio.a)
   link_directories (/usr/local/lib)
   find_library(AAIOLIB NAMES libaaio.a)
-  set(EXTRA_LIBRARIES1 portsf pthread ${AAIOLIB} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
+  set(EXTRA_LIBRARIES1 portsf pthread portaudio  ${AAIOLIB} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
   
 else()
   if(MINGW)
@@ -18,11 +22,11 @@ else()
     link_directories (/usr/local/lib)
     find_library(AAIOLIB NAMES libaaio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 jack asound portsf pthread ${EXTRA_LIBRARIES})
+    set(EXTRA_LIBRARIES1 jack asound portsf pthread ${AAIOLIB} ${EXTRA_LIBRARIES})
   endif()
 endif()
 
-link_directories(../../lib ../portaudio/lib/.libs  /usr/local/lib)
+link_directories(../portaudio/lib/.libs ../../lib )
 include_directories(../../include ../include ../portaudio/include ../portaudio/src/common /usr/local/include)
 
 if(MINGW)
@@ -30,6 +34,6 @@ add_executable(paplay paplay.c fmhfuncs.c cmakedummy.cpp)
 else()
 add_executable(paplay paplay.c fmhfuncs.c)
 endif()
-target_link_libraries(paplay portaudio.a  ${EXTRA_LIBRARIES1})
+target_link_libraries(paplay ${EXTRA_LIBRARIES1})
 
 my_install(paplay)