Browse Source

cross-platform fixes, change synthesis to newsynth

richarddobson 3 years ago
parent
commit
c900c509e3
1 changed files with 11 additions and 4 deletions
  1. 11 4
      dev/science/CMakeLists.txt

+ 11 - 4
dev/science/CMakeLists.txt

@@ -210,7 +210,11 @@ target_link_libraries(splinter  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 my_install(splinter)
 my_install(splinter)
 
 
 add_executable(strands strands.c)
 add_executable(strands strands.c)
+if(MINGW)
+target_link_libraries(strands  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
+else()
 target_link_libraries(strands  cdp2k sfsys pvxio2 ${AAIOLIB} ${EXTRA_LIBRARIES})
 target_link_libraries(strands  cdp2k sfsys pvxio2 ${AAIOLIB} ${EXTRA_LIBRARIES})
+endif()
 
 
 my_install(strands)
 my_install(strands)
 
 
@@ -229,10 +233,13 @@ target_link_libraries(synspline  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 
 
 my_install(synspline)
 my_install(synspline)
 
 
-add_executable(synthesis synthesis.c)
-target_link_libraries(synthesis  cdp2k sfsys pvxio2 ${AAIOLIB} ${EXTRA_LIBRARIES})
-
-my_install(synthesis)
+add_executable(newsynth synthesis.c)
+if(MINGW)
+target_link_libraries(newsynth  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
+else()
+target_link_libraries(newsynth  cdp2k sfsys pvxio2 ${AAIOLIB} ${EXTRA_LIBRARIES})
+endif()
+my_install(newsynth)
 
 
 add_executable(tesselate tesselate.c)
 add_executable(tesselate tesselate.c)
 target_link_libraries(tesselate  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})
 target_link_libraries(tesselate  cdp2k sfsys pvxio2 ${EXTRA_LIBRARIES})