cmake build system: better win32 support

Signed-off-by: Tim Blechmann <tim@klingt.org>

CMakeLists.txt

@@ -106,7 +106,7 @@ if (NOT PTHREADS_FOUND)
 endif()
 include_directories(${PTHREADS_INCLUDE_DIR})
 
-if (MSVC)
+if (MSVC OR MINGW)
     set(MATH_LIBRARY "")
 else()
     find_library(MATH_LIBRARY m)

external_libraries/CMakeLists.txt

@@ -7,16 +7,18 @@ aux_source_directory(boost/libs/thread/src/ boost_thread )
 
 include_directories(boost)
 
-if (PTHREADS_FOUND)
-    aux_source_directory(boost/libs/thread/src/pthread/ boost_thread_posix )
-    add_library(boost_thread STATIC ${boost_thread} ${boost_thread_posix})
-    target_link_libraries(boost_thread ${PTHREADS_LIBRARY})
-
-    include_directories(${PTHREADS_INCLUDE_DIR})
+if(WIN32)
+    aux_source_directory(boost/libs/thread/src/win32/ boost_thread_platform )
+elseif(PTHREADS_FOUND)
+    aux_source_directory(boost/libs/thread/src/pthread/ boost_thread_platform )
 else()
-    message(SEND_ERROR "we need to implement boost_thread for non-posix systems")
+    message(SEND_ERROR "we need to implement boost_thread")
 endif()
 
+add_library(boost_thread STATIC ${boost_thread} ${boost_thread_platform})
+target_link_libraries(boost_thread ${PTHREADS_LIBRARY})
+
+include_directories(${PTHREADS_INCLUDE_DIR})
 
 
 aux_source_directory(boost/libs/program_options/src/ boost_program_options )

lang/CMakeLists.txt

@@ -1,3 +1,5 @@
+find_package(FFTW3f)
+
 include_directories(${CMAKE_SOURCE_DIR}/include/common
                     ${CMAKE_SOURCE_DIR}/include/lang
                     ${CMAKE_SOURCE_DIR}/include/plugin_interface
@@ -233,6 +235,15 @@ elseif(NOT NO_LIBSNDFILE)
 	message(SEND_ERROR "Cannot find libsndfile")
 endif(SNDFILE_FOUND)
 
+if (FFTW3F_FOUND)
+	include_directories (${FFTW3F_INCLUDE_DIR})
+	target_link_libraries(libsclang ${FFTW3F_LIBRARY})
+endif()
+
+if (WIN32)
+	target_link_libraries(libsclang wsock32 ws2_32)
+endif()
+
 if (GC_SANITYCHECK)
 	add_definitions(-DGC_SANITYCHECK)
 endif()

server/scsynth/CMakeLists.txt

@@ -1,4 +1,7 @@
 find_package(Sndfile)
+if (WIN32)
+	find_package(Portaudio)
+endif()
 
 # here we choose who provides us with the FFT lib
 if (FFT_GREEN)
@@ -162,6 +165,16 @@ elseif(AUDIOAPI STREQUAL coreaudio)
 	target_link_libraries(libscsynth "-framework CoreAudio")
 endif()
 
+if(PTHREADS_FOUND)
+	target_link_libraries(libscsynth ${PTHREADS_LIBRARIES})
+endif()
+
+
+if (WIN32)
+	target_link_libraries(libscsynth wsock32 ws2_32)
+endif()
+
+
 set_property(TARGET libscsynth PROPERTY OUTPUT_NAME scsynth)
 # These two properties are ABI version info, not sc version:
 set_property(TARGET libscsynth PROPERTY VERSION     1.0.0)