Browse Source

cross-platform fixes, remove newsynth

richarddobson 3 years ago
parent
commit
3153b8ece1
1 changed files with 12 additions and 11 deletions
  1. 12 11
      dev/new/CMakeLists.txt

+ 12 - 11
dev/new/CMakeLists.txt

@@ -1,16 +1,16 @@
 if(APPLE)
 if(APPLE)
   set(CMAKE_C_FLAGS "-O2 -Wall -Dunix")
   set(CMAKE_C_FLAGS "-O2 -Wall -Dunix")
-  
+  link_directories (/usr/local/lib)
+  find_library(AAIOLIB NAMES libaaio.a)
 else()
 else()
   if(MINGW)
   if(MINGW)
     set(CMAKE_C_FLAGS "-O2 -Wall -DWIN32")
     set(CMAKE_C_FLAGS "-O2 -Wall -DWIN32")
   else()
   else()
     set(CMAKE_C_FLAGS "-O2 -Wall -Dlinux -Dunix")
     set(CMAKE_C_FLAGS "-O2 -Wall -Dlinux -Dunix")
+    link_directories (/usr/local/lib)
+    find_library(AAIOLIB NAMES libaaio.a)
   endif()
   endif()
 endif()
 endif()
-#RWD only need this for APPLE?
-link_directories (/usr/local/lib)
-find_library(AAIOLIB NAMES libaaio.a)
 
 
 link_directories(../cdp2k ../newsfsys ../pvxio2)
 link_directories(../cdp2k ../newsfsys ../pvxio2)
 
 
@@ -42,8 +42,11 @@ target_link_libraries(filtrage cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 my_install(filtrage)
 my_install(filtrage)
 
 
 add_executable(fracture fracture.c)
 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 ${AAIOLIB} ${EXTRA_LIBRARIES})
-
+endif()
 my_install(fracture)
 my_install(fracture)
 
 
 add_executable(glisten glisten.c)
 add_executable(glisten glisten.c)
@@ -57,8 +60,11 @@ target_link_libraries(isolate cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 my_install(isolate)
 my_install(isolate)
 
 
 add_executable(iterfof iterfof.c)
 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 ${AAIOLIB} cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
-
+endif()
 my_install(iterfof)
 my_install(iterfof)
 
 
 add_executable(iterline iterline.c)
 add_executable(iterline iterline.c)
@@ -86,11 +92,6 @@ target_link_libraries(newmorph cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 
 
 my_install(newmorph)
 my_install(newmorph)
 
 
-add_executable(newsynth synthesis.c)
-target_link_libraries(newsynth ${AAIOLIB} cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
-
-my_install(newsynth)
-
 add_executable(newtex newtex.c)
 add_executable(newtex newtex.c)
 target_link_libraries(newtex ${AAIOLIB} cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 target_link_libraries(newtex ${AAIOLIB} cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})