updated rules for MinGW

dev/externals/paprogs/listaudevs/CMakeLists.txt

@@ -9,6 +9,7 @@ if(APPLE)
 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})
   else()
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
@@ -19,8 +20,11 @@ endif()
 link_directories(../../include ../portaudio/lib/.libs)
 
 include_directories(../../../include ../include ../portaudio/include ../portaudio/src/common )
-
+if(MINGW)
+add_executable(listaudevs devs.c cmakedummy.cpp)
+else()
 add_executable(listaudevs devs.c)
+endif()
 target_link_libraries(listaudevs portaudio.a  ${EXTRA_LIBRARIES1})
 
 my_install(listaudevs)

dev/externals/paprogs/paplay/CMakeLists.txt

@@ -5,26 +5,31 @@ if(APPLE)
   find_library(AUDIOTOOLBOX AudioToolbox)
   find_library(AULIB AudioUnit)
   find_library(CARBONLIB Carbon)
-  find_library(AAIOLIB names libaaio.a paths /usr/local/lib)
+  link_directories (/usr/local/lib)
+  find_library(AAIOLIB NAMES libaaio.a)
   set(EXTRA_LIBRARIES1 portsf pthread ${AAIOLIB} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
   
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 winmm dsound winspool ${EXTRA_LIBRARIES})
+    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})
   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})
   endif()
 endif()
 
-
-
 link_directories(../../lib ../portaudio/lib/.libs  /usr/local/lib)
-
 include_directories(../../include ../include ../portaudio/include ../portaudio/src/common /usr/local/include)
 
+if(MINGW)
+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})
 
 my_install(paplay)

dev/externals/paprogs/pvplay/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(APPLE)
-#-mmacosx-version-min=10.9
   set(CMAKE_C_FLAGS "-O2 -Wall  -Dunix  -DMAC -DPA_USE_COREAUDIO -fomit-frame-pointer -funroll-loops")
   set(CMAKE_CXX_FLAGS "-O2 -Wall  -Dunix -DMAC -DPA_USE_COREAUDIO -fomit-frame-pointer -funroll-loops -std=c++11 -stdlib=libc++")
   include_directories ( /Developer/Headers/FlatCarbon )
@@ -7,7 +6,6 @@ if(APPLE)
   find_library(AUDIOTOOLBOX AudioToolbox)
   find_library(AULIB AudioUnit)
   find_library(CARBONLIB Carbon)
-  #RWD only need this for APPLE?
   link_directories (/usr/local/lib)
   find_library(AAIOLIB NAMES libaaio.a)
   set(EXTRA_LIBRARIES1 pthread ${AAIOLIB} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
@@ -15,7 +13,7 @@ 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 ${EXTRA_LIBRARIES})
+    set(EXTRA_LIBRARIES1 winmm dsound winspool ${EXTRA_LIBRARIES})
   else()
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
     set(EXTRA_LIBRARIES1 asound jack pthread ${EXTRA_LIBRARIES})

dev/externals/paprogs/recsf/CMakeLists.txt

@@ -5,23 +5,30 @@ if(APPLE)
   find_library(AUDIOTOOLBOX AudioToolbox)
   find_library(AULIB AudioUnit)
   find_library(CARBONLIB Carbon)
-  find_library(AAIOLIB names libaaio.a paths /usr/local/lib)
+  link_directories (/usr/local/lib)
+  find_library(AAIOLIB NAMES libaaio.a)
   set(EXTRA_LIBRARIES1 portsf pthread ${AAIOLIB} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 ${EXTRA_LIBARIES})
+    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_LIBARIES})
   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 asound jack pthread m ${EXTRA_LIBARIES})
+    set(EXTRA_LIBRARIES1 asound jack pthread m aaio ${EXTRA_LIBARIES})
   endif()
 endif()
 
-link_directories(../../lib ../portaudio/lib/.libs)
+link_directories(../../lib ../portaudio/lib/.libs /usr/local/lib)
 
 include_directories(../../include ../portaudio/include ../portaudio/src/common /usr/local/include)
-
-add_executable(recsf recsf.c)
+if(MINGW)
+    add_executable(recsf recsf.c cmakedummy.cpp)
+else()
+    add_executable(recsf recsf.c)
+endif()
 target_link_libraries(recsf portaudio.a portsf ${EXTRA_LIBRARIES1})
 
 my_install(recsf)