Procházet zdrojové kódy

complete for MinGW, assume full install of portaudio

richarddobson před 3 roky
rodič
revize
91c5248c74
1 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 4 4
      dev/externals/paprogs/paplay/CMakeLists.txt

+ 4 - 4
dev/externals/paprogs/paplay/CMakeLists.txt

@@ -7,10 +7,8 @@ if(APPLE)
   find_library(AULIB AudioUnit)
   find_library(CARBONLIB Carbon) 
   find_library(CORESERV CoreServices)
-#  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} ${PA}  ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
   
@@ -18,10 +16,12 @@ else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -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 portsf ${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 portsf $(PA) winmm ${EXTRA_LIBRARIES})
   else()
     link_directories (/usr/local/lib)
- #   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")