Merge pull request #1151 from hlolli/jack2win32Fixes

small fixes for rtjack compilation on win32
csound · Oct 15, 2019 · c7b991b · c7b991b
2 parents 6b7da4b + 404ae3f
commit c7b991b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/InOut/CMakeLists.txt b/InOut/CMakeLists.txt
@@ -52,13 +52,17 @@ if(USE_PORTMIDI)
 endif()
 if(USE_JACK)
     find_library(JACK_LIBRARY jack)
-    find_library(JACKDMP_LIBRARY jackdmp)
     check_include_file(jack/jack.h JACK_HEADER)
     if(APPLE)
     # VL: could not find a way to make check_include_file() work so
     # I am hardcoding it for MacOS
     set(JACK_HEADER  "jack/jack.h")
     endif()
+    if(WIN32)
+    # HLO: including the jack2 common source dir
+    # prevents "cannot open include file" errors
+    find_path(JACK_INCLUDE_PATH jack/jack.h)
+    endif()
 endif()
 if(USE_PULSEAUDIO)
     find_library(PULSEAUDIO_LIBRARY pulse)
@@ -215,8 +219,10 @@ if(USE_JACK)
         list(APPEND rtjack_LIBS
             ${JACK_LIBRARY} ${PTHREAD_LIBRARY})
     elseif(WIN32)
+        check_deps(JACK_INCLUDE_PATH)
+        include_directories("${JACK_INCLUDE_PATH}")
         list(APPEND rtjack_LIBS
-            ${JACKDMP_LIBRARY} ${PTHREAD_LIBRARY})
+            ${JACK_LIBRARY} ${PTHREAD_LIBRARY})
     else()
         list(APPEND rtjack_LIBS
             ${JACK_LIBRARY} ${PTHREAD_LIBRARY})