revised to use cmake build of aaio library

dev/externals/paprogs/paplay/CMakeLists.txt

@@ -9,9 +9,9 @@ if(APPLE)
   find_library(CORESERV CoreServices)
   link_directories (/usr/local/lib)
   find_library(PA NAMES libportaudio.a)
-  find_library(AAIOLIB NAMES libaaio.a)
-  set(EXTRA_LIBRARIES1 portsf pthread ${AAIOLIB} ${PA}  ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
-  
+#  find_library(AAIOLIB NAMES libaaio.a)
+#  set(EXTRA_LIBRARIES1 portsf pthread ${AAIOLIB} ${PA}  ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
+  set(EXTRA_LIBRARIES1 portsf pthread aaio ${PA}  ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
@@ -23,9 +23,10 @@ else()
   else()
     link_directories (/usr/local/lib)
     find_library(PA NAMES libportaudio.a)
-    find_library(AAIOLIB NAMES libaaio.a)
+#    find_library(AAIOLIB NAMES libaaio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 portsf pthread ${AAIOLIB} ${PA} ${EXTRA_LIBRARIES} jack asound)
+#    set(EXTRA_LIBRARIES1 jack asound portsf portaudio pthread ${AAIOLIB} ${PA} ${EXTRA_LIBRARIES})
+	set(EXTRA_LIBRARIES1  portsf portaudio pthread aaio ${PA} ${EXTRA_LIBRARIES} jack asound)
   endif()
 endif()
 

dev/externals/paprogs/pvplay/CMakeLists.txt

@@ -9,8 +9,8 @@ if(APPLE)
   find_library(CARBONLIB Carbon)
   link_directories (/usr/local/lib)
   find_library(PA NAMES libportaudio.a)
-  find_library(AAIOLIB NAMES libaaio.a)
-  set(EXTRA_LIBRARIES1 pthread ${AAIOLIB} ${PA} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
+# find_library(AAIOLIB NAMES libaaio.a)
+  set(EXTRA_LIBRARIES1 pthread  ${PA} aaio ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
@@ -21,10 +21,10 @@ else()
     set(EXTRA_LIBRARIES1 dsound winspool ${PA} winmm ${EXTRA_LIBRARIES})
   else()
     link_directories (/usr/local/lib)
-    find_library(AAIOLIB NAMES libaaio.a)
+#    find_library(AAIOLIB NAMES libaaio.a)
     find_library(PA NAMES libportaudio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 pthread ${AAIOLIB} ${PA}  ${EXTRA_LIBRARIES} asound jack)
+    set(EXTRA_LIBRARIES1  pthread aaio ${PA}  ${EXTRA_LIBRARIES} asound jack)
   endif()
 endif()
 # ../portaudio/lib/.libs

dev/externals/paprogs/recsf/CMakeLists.txt

@@ -8,8 +8,8 @@ if(APPLE)
   find_library(CARBONLIB Carbon)
   link_directories (/usr/local/lib)
   find_library(PA NAMES libportaudio.a)
-  find_library(AAIOLIB NAMES libaaio.a)
-  set(EXTRA_LIBRARIES1 portsf pthread ${AAIOLIB} ${PA} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
+#  find_library(AAIOLIB NAMES libaaio.a)
+  set(EXTRA_LIBRARIES1 portsf pthread aaio ${PA} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
@@ -20,10 +20,10 @@ else()
     set(EXTRA_LIBRARIES1 dsound winspool portsf ${PA} winmm ${EXTRA_LIBARIES})
   else()
     link_directories (/usr/local/lib)
-    find_library(AAIOLIB NAMES libaaio.a) 
-    find_library(PA NAMES libportaudio.c)
+#    find_library(AAIOLIB NAMES libaaio.a) 
+    find_library(PA NAMES libportaudio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 portsf pthread m ${AAIOLIB} ${PA} ${EXTRA_LIBARIES} asound jack)
+    set(EXTRA_LIBRARIES1  portsf pthread m aaio ${PA} ${EXTRA_LIBARIES} asound jack)
   endif()
 endif()
 

dev/new/CMakeLists.txt

@@ -1,14 +1,14 @@
 if(APPLE)
   set(CMAKE_C_FLAGS "-O2 -Wall -Dunix")
   link_directories (/usr/local/lib)
-  find_library(AAIOLIB NAMES libaaio.a)
+#  find_library(AAIOLIB NAMES libaaio.a)
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O2 -Wall -DWIN32")
   else()
     set(CMAKE_C_FLAGS "-O2 -Wall -Dlinux -Dunix")
     link_directories (/usr/local/lib)
-    find_library(AAIOLIB NAMES libaaio.a)
+#    find_library(AAIOLIB NAMES libaaio.a)
   endif()
 endif()
 
@@ -45,7 +45,7 @@ add_executable(fracture fracture.c)
 if(MINGW)
 target_link_libraries(fracture cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 else()
-target_link_libraries(fracture cdp2k sfsys pvxio2 ${AAIOLIB} ${EXTRA_LIBRARIES})
+target_link_libraries(fracture cdp2k sfsys pvxio2 aaio ${EXTRA_LIBRARIES})
 endif()
 my_install(fracture)
 
@@ -63,7 +63,7 @@ add_executable(iterfof iterfof.c)
 if(MINGW)
 target_link_libraries(iterfof cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 else()
-target_link_libraries(iterfof ${AAIOLIB} cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
+target_link_libraries(iterfof cdp2k sfsys pvxio2 aaio ${EXTRA_LIBRARIES})
 endif()
 my_install(iterfof)
 
@@ -93,7 +93,7 @@ target_link_libraries(newmorph cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 my_install(newmorph)
 
 add_executable(newtex newtex.c)
-target_link_libraries(newtex ${AAIOLIB} cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
+target_link_libraries(newtex cdp2k sfsys pvxio2 aaio ${EXTRA_LIBRARIES})
 
 my_install(newtex)
 

dev/science/CMakeLists.txt

@@ -1,14 +1,14 @@
 if(APPLE)
    set(CMAKE_C_FLAGS "-O2 -Wall  -Dunix")
    link_directories (/usr/local/lib)
-   find_library(AAIOLIB NAMES libaaio.a)
+#   find_library(AAIOLIB NAMES libaaio.a)
 else()
   if(MINGW)
     set(CMAKE_C_FLAGS "-O2 -Wall -DWIN32")
   else()
     set(CMAKE_C_FLAGS "-O2 -Wall -Dlinux -Dunix")
     link_directories (/usr/local/lib)
-    find_library(AAIOLIB NAMES libaaio.a)
+#    find_library(AAIOLIB NAMES libaaio.a)
   endif()
 endif()
 
@@ -214,7 +214,7 @@ target_link_libraries(splinter  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 my_install(splinter)
 
 add_executable(strands strands.c)
-target_link_libraries(strands  cdp2k sfsys pvxio2 ${AAIOLIB} ${EXTRA_LIBRARIES})
+target_link_libraries(strands  cdp2k sfsys pvxio2 aaio ${EXTRA_LIBRARIES})
 
 my_install(strands)
 
@@ -234,7 +234,7 @@ target_link_libraries(synspline  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 my_install(synspline)
 
 add_executable(newsynth synthesis.c)
-target_link_libraries(newsynth  cdp2k sfsys pvxio2 ${AAIOLIB} ${EXTRA_LIBRARIES})
+target_link_libraries(newsynth  cdp2k sfsys pvxio2 aaio ${EXTRA_LIBRARIES})
 
 my_install(newsynth)