Browse Source

revised for Mac, Linux

richarddobson 2 years ago
parent
commit
8c48c06e16
1 changed files with 6 additions and 5 deletions
  1. 6 5
      dev/externals/paprogs/paplay/CMakeLists.txt

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

@@ -1,17 +1,18 @@
 if(APPLE)
 #-mmacosx-version-min=10.9
-  set(CMAKE_C_FLAGS "-std=c99 -arch x86_64  -O2 -Wall -Dunix -fomit-frame-pointer -funroll-loops")
+  set(CMAKE_C_FLAGS "-std=c99 -mmacosx-version-min=10.9 -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(CORESERV CoreServices)
-  link_directories (/Users/Leverhulme/CDP8/CDPr8src/dev/externals/paprogs/portaudio/lib/.libs)
-  find_library(PA NAMES libportaudio.a)
+#  link_directories (/Users/Leverhulme/CDP8/CDPr8src/dev/externals/paprogs/portaudio/lib/.libs)
   link_directories (/usr/local/lib)
+  find_library(PA NAMES libportaudio.a)
+  
   find_library(AAIOLIB NAMES libaaio.a)
-  set(EXTRA_LIBRARIES1 portsf pthread portaudio  ${AAIOLIB} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
+  set(EXTRA_LIBRARIES1 portsf pthread portaudio  ${AAIOLIB} ${PA}  ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
   
 else()
   if(MINGW)
@@ -20,7 +21,7 @@ else()
     set(EXTRA_LIBRARIES1 winmm dsound winspool portsf ${EXTRA_LIBRARIES})
   else()
     link_directories (/usr/local/lib)
-    link_directories (../portaudio/lib/.libs)
+ #   link_directories (../portaudio/lib/.libs)
     find_library(PA NAMES libportaudio.a)
     find_library(AAIOLIB NAMES libaaio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")