Browse Source

adapted for MinGW using full PA install

richarddobson 3 years ago
parent
commit
028bcc26cd
1 changed files with 11 additions and 5 deletions
  1. 11 5
      dev/externals/paprogs/listaudevs/CMakeLists.txt

+ 11 - 5
dev/externals/paprogs/listaudevs/CMakeLists.txt

@@ -1,23 +1,29 @@
 if(APPLE)
+# -mmacosx-version-min=10.9
   set(CMAKE_C_FLAGS "-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)
-  set(EXTRA_LIBRARIES1 ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
+  link_directories (/usr/local/lib)
+  find_library(PA NAMES libportaudio.a)
+  set(EXTRA_LIBRARIES1 ${PA} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops")
     set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
-    set(EXTRA_LIBRARIES1 winmm dsound winspool ${EXTRA_LIBRARIES})
+    link_directories(/usr/local/lib)
+    find_library(PA NAMES libportaudio.a)
+#    NB winmm must appear after any module that references it. Yes, that's weird.
+    set(EXTRA_LIBRARIES1 dsound winspool ${PA} winmm ${EXTRA_LIBRARIES})
   else()
     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 pthread ${EXTRA_LIBRARIES})
   endif()
 endif()
 
-link_directories(../../include ../portaudio/lib/.libs)
+link_directories(../../include)
 
 include_directories(../../../include ../include ../portaudio/include ../portaudio/src/common )
 if(MINGW)
@@ -25,6 +31,6 @@ add_executable(listaudevs devs.c cmakedummy.cpp)
 else()
 add_executable(listaudevs devs.c)
 endif()
-target_link_libraries(listaudevs portaudio.a  ${EXTRA_LIBRARIES1})
+target_link_libraries(listaudevs ${EXTRA_LIBRARIES1})
 
 my_install(listaudevs)