adjust flag rules for MSVC

dev/externals/fastconv/CMakeLists.txt

@@ -3,9 +3,16 @@ if(APPLE)
   set(CMAKE_CXX_FLAGS "-O2 -Wall  -Dunix -fomit-frame-pointer -funroll-loops  -std=c++11 -stdlib=libc++")
 else()
   if(MINGW OR MSVC)
-    set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops")
-    set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
-  else()
+    if(MINGW) 
+      set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops")
+      set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
+     else()
+      set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32")
+      set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32")
+
+     endif()
+      
+   else()
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
   endif()
 endif()

dev/externals/mctools/CMakeLists.txt

@@ -4,10 +4,12 @@ if(APPLE)
 #  SET(CMAKE_EXE_LINKER_FLAGS "-static")
 else()
   if(MINGW OR MSVC)
-    set(CMAKE_C_FLAGS "-O2 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops")
+    
     if(MINGW)
+        set(CMAKE_C_FLAGS "-O2 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops")
         set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
     else()
+        set(CMAKE_C_FLAGS "-O2 -DWIN32 -D_WIN32")
         set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32")
     endif()
   else()
@@ -41,8 +43,11 @@ target_link_libraries(fmdcode portsf ${EXTRA_LIBRARIES})
 my_install(fmdcode)
 
 add_executable(channelx channel.c)
-target_link_libraries(channelx portsf m ${EXTRA_LIBRARIES})
-
+if(MSVC)
+ target_link_libraries(channelx portsf ${EXTRA_LIBRARIES})
+else()
+  target_link_libraries(channelx portsf m ${EXTRA_LIBRARIES})
+endif()
 my_install(channelx)
 
 add_executable(chorder chorder.c)

dev/externals/paprogs/CMakeLists.txt

@@ -1,4 +1,4 @@
-
+add_subdirectory(portaudio)
 add_subdirectory(listaudevs)
 add_subdirectory(paplay)
 add_subdirectory(pvplay)

dev/externals/paprogs/listaudevs/CMakeLists.txt

@@ -11,13 +11,13 @@ if(APPLE)
   set(EXTRA_LIBRARIES1 ${PA} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
 else()
   if(MINGW OR MSVC)
-    set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops")
+    set(CMAKE_C_FLAGS "-O2 -DWIN32 -D_WIN32 -fomit-frame-pointer  -funroll-loops")
     if(MINGW)
-        set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
+        set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
     else()
-        set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops)
+        set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO")
     endif()
-    link_directories(/usr/local/lib)
+ #   link_directories(/usr/local/lib)
     find_library(PA NAMES libportaudio.a)
 #    NB winmm must appear after any module that references it. Yes, that's weird.
     set(EXTRA_LIBRARIES1 dsound winspool ${PA} winmm ${EXTRA_LIBRARIES})
@@ -30,7 +30,7 @@ else()
   endif()
 endif()
 
-link_directories(../../lib)
+link_directories(../portaudio)
 
 include_directories( ../../../include ../include ../portaudio/include ../portaudio/src/common )
 if(MINGW)
@@ -38,6 +38,6 @@ add_executable(listaudevs devs.c cmakedummy.cpp)
 else()
 add_executable(listaudevs devs.c)
 endif()
-target_link_libraries(listaudevs ${EXTRA_LIBRARIES1})
+target_link_libraries(listaudevs portaudio ${EXTRA_LIBRARIES1})
 
 my_install(listaudevs)

dev/externals/paprogs/paplay/CMakeLists.txt

@@ -14,16 +14,16 @@ if(APPLE)
   set(EXTRA_LIBRARIES1 portsf pthread aaio ${PA}  ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${CORESERV} ${EXTRA_LIBRARIES})
 else()
   if(MINGW OR MSVC)
-    set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
+    set(CMAKE_C_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
     if(MINGW)
-        set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
+        set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
     else()
-        set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops)
+        set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO")
     endif()
-    link_directories(/usr/local/lib)
+  #  link_directories(/usr/local/lib)
     find_library(PA NAMES libportaudio.a)
 #    NB winmm must appear after any module that references it. Yes, that's weird.
-    set(EXTRA_LIBRARIES1 dsound winspool portsf ${PA} winmm ${EXTRA_LIBRARIES})
+    set(EXTRA_LIBRARIES1 dsound winspool portsf portaudio winmm ${EXTRA_LIBRARIES})
   else()
     link_directories (/usr/local/lib)
     find_library(PA NAMES libportaudio.a)
@@ -42,6 +42,6 @@ add_executable(paplay paplay.c fmhfuncs.c cmakedummy.cpp)
 else()
 add_executable(paplay paplay.c fmhfuncs.c )
 endif()
-target_link_libraries(paplay ${EXTRA_LIBRARIES1})
+target_link_libraries(paplay libportaudio.a ${EXTRA_LIBRARIES1})
 
 my_install(paplay)

dev/externals/paprogs/pvplay/CMakeLists.txt

@@ -13,16 +13,16 @@ if(APPLE)
   set(EXTRA_LIBRARIES1 pthread  ${PA} aaio ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
 else()
   if(MINGW OR MSVC)
-    set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
+    set(CMAKE_C_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
     if(MINGW)
-        set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops -static-libgcc -static-libstdc++")
+        set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops -static-libgcc -static-libstdc++")
     else()
-        set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops)
+        set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO")
     endif()
-    link_directories(/usr/local/lib)
-    find_library(PA NAMES libportaudio.a)
+#    link_directories(/usr/local/lib)
+#    find_library(PA NAMES libportaudio.a)
 #    NB winmm must appear after any module that references it. Yes, that's weird.
-    set(EXTRA_LIBRARIES1 dsound winspool ${PA} winmm ${EXTRA_LIBRARIES})
+    set(EXTRA_LIBRARIES1 dsound winspool portaudio winmm ${EXTRA_LIBRARIES})
   else()
     link_directories (/usr/local/lib)
 #    find_library(AAIOLIB NAMES libaaio.a)

dev/externals/paprogs/recsf/CMakeLists.txt

@@ -12,16 +12,16 @@ if(APPLE)
   set(EXTRA_LIBRARIES1 portsf pthread aaio ${PA} ${COREAUDIOLIB} ${AUDIOTOOLBOX} ${AULIB} ${CARBONLIB} ${EXTRA_LIBRARIES})
 else()
   if(MINGW OR MSVC)
-    set(CMAKE_C_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
+    set(CMAKE_C_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer -funroll-loops")
     if(MINGW)
-    	set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
+    	set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops -static-libgcc -static-libstdc++")
     else()
-        set(CMAKE_CXX_FLAGS "-O3 -DWIN32 -D_WIN32 -DUSE_ASIO -fomit-frame-pointer  -funroll-loops)
+        set(CMAKE_CXX_FLAGS "-O2 -DWIN32 -D_WIN32 -DUSE_ASIO")
     endif()
-    link_directories(/usr/local/lib)
-    find_library(PA NAMES libportaudio.a)
+#    link_directories(/usr/local/lib)
+#   find_library(PA NAMES libportaudio.a)
 #    NB winmm must appear after any module that references it. Yes, that's weird.
-    set(EXTRA_LIBRARIES1 dsound winspool portsf ${PA} winmm ${EXTRA_LIBARIES})
+    set(EXTRA_LIBRARIES1 dsound winspool portsf portaudio winmm ${EXTRA_LIBARIES})
   else()
     link_directories (/usr/local/lib)
 #    find_library(AAIOLIB NAMES libaaio.a)