Jamulus.pro jackonwindows support improvements (#1718)

* adding win64 platform * modif win64 target to QT ARCH X86_64 version * i386 + hard coded path + cross compile * adding win64 platform * modif win64 target to QT ARCH X86_64 version * i386 + hard coded path + cross compile * libjack-name -> libjackname * indentation -> space/tab correction * x86 correction + message for JACK * cross compilation correction + add programfilesdir + indent * space + exists + quotes * using else + 1 check for jack.h * Changing not exists to exists logic
jamulussoftware · Jun 4, 2021 · d6acd63 · d6acd63
1 parent 427a61f
commit d6acd63
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/Jamulus.pro b/Jamulus.pro
@@ -93,10 +93,22 @@ win32 {
 
     # replace ASIO with jack if requested
     contains(CONFIG, "jackonwindows") {
-        message(Using Jack instead of ASIO.)
-
-        !exists("C:/Program Files (x86)/Jack/includes/jack/jack.h") {
-            message(Warning: jack.h was not found at the usual place, maybe jack is not installed)
+        contains(QT_ARCH, "i386") {
+            exists("C:/Program Files (x86)") {
+                message("Cross compilation build")
+                programfilesdir = "C:/Program Files (x86)"
+            } else {
+                message("Native i386 build")
+                programfilesdir = "C:/Program Files"
+            }
+            libjackname = "libjack.lib"
+        } else {
+            message("Native x86_64 build")
+            programfilesdir = "C:/Program Files"
+            libjackname = "libjack64.lib"
+        }
+        !exists("$${programfilesdir}/JACK2/include/jack/jack.h") {
+            message("Warning: jack.h was not found in the expected location ($${programfilesdir}). Ensure that the right JACK2 variant is installed (32bit vs. 64bit).")
         }
 
         HEADERS -= windows/sound.h
@@ -106,9 +118,10 @@ win32 {
         DEFINES += WITH_JACK
         DEFINES += JACK_REPLACES_ASIO
         DEFINES += _STDINT_H # supposed to solve compilation error in systemdeps.h
-        INCLUDEPATH += "C:/Program Files (x86)/Jack/includes"
-        LIBS += "C:/Program Files (x86)/Jack/lib/libjack64.lib"
+        INCLUDEPATH += "$${programfilesdir}/JACK2/include"
+        LIBS += "$${programfilesdir}/JACK2/lib/$${libjackname}"
     }
+
 } else:macx {
     contains(CONFIG, "server_bundle") {
         message(The generated application bundle will run a server instance.)
@@ -151,7 +164,7 @@ win32 {
 
         !exists(/usr/include/jack/jack.h) {
             !exists(/usr/local/include/jack/jack.h) {
-                 message(Warning: jack.h was not found at the usual place, maybe jack is not installed)
+                 message("Warning: jack.h was not found at the usual place, maybe jack is not installed")
             }
         }