From 94ae26836cea01741c7a0397f9bb1ce82b3e6d15 Mon Sep 17 00:00:00 2001
From: ann0see <20726856+ann0see@users.noreply.github.com>
Date: Sat, 29 Apr 2023 22:58:18 +0200
Subject: [PATCH 1/2] Add some documentation to Jamulus.pro

---
 Jamulus.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jamulus.pro b/Jamulus.pro
index 0953fcb431..3418e260cf 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -125,7 +125,7 @@ win32 {
                 libjackname = "libjack64.lib"
             }
             !exists("$${programfilesdir}/JACK2/include/jack/jack.h") {
-                error("Error: jack.h was not found in the expected location ($${programfilesdir}). Ensure that the right JACK2 variant is installed (32bit vs. 64bit).")
+                error("Error: jack.h was not found in the expected location ($${programfilesdir}). Ensure that the right JACK2 variant is installed (32 Bit vs. 64 Bit).")
             }
 
             HEADERS += src/sound/jack/sound.h
@@ -178,6 +178,7 @@ win32 {
     QMAKE_BUNDLE_DATA += OSX_ENTITLEMENTS
 
     macx-xcode {
+        # As of 2023-04-15 the macOS build with Xcode only fails. This is tracked in #1841
         QMAKE_INFO_PLIST = mac/Info-xcode.plist
         XCODE_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
         XCODE_ENTITLEMENTS.value = mac/Jamulus.entitlements

From 8493ddc83098f13224efe86d002329be5ece07c3 Mon Sep 17 00:00:00 2001
From: ann0see <20726856+ann0see@users.noreply.github.com>
Date: Sat, 29 Apr 2023 23:02:03 +0200
Subject: [PATCH 2/2] Refactoring: Use global definition of JACK sources and
 headers

---
 Jamulus.pro | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Jamulus.pro b/Jamulus.pro
index 3418e260cf..3fd9ce3f3e 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -68,6 +68,10 @@ INCLUDEPATH_OPUS = libs/opus/include \
     libs/opus/silk/fixed \
     libs/opus
 
+# As JACK is used in multiple OS, we declare it globally
+HEADERS_JACK = src/sound/jack/sound.h
+SOURCES_JACK = src/sound/jack/sound.cpp
+
 DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
     CUSTOM_MODES \
     _REENTRANT
@@ -128,8 +132,8 @@ win32 {
                 error("Error: jack.h was not found in the expected location ($${programfilesdir}). Ensure that the right JACK2 variant is installed (32 Bit vs. 64 Bit).")
             }
 
-            HEADERS += src/sound/jack/sound.h
-            SOURCES += src/sound/jack/sound.cpp
+            HEADERS += $$HEADERS_JACK
+            SOURCES += $$SOURCES_JACK
             DEFINES += WITH_JACK
             DEFINES += JACK_ON_WINDOWS
             DEFINES += _STDINT_H # supposed to solve compilation error in systemdeps.h
@@ -209,8 +213,8 @@ win32 {
                  error("Error: jack.h was not found at the usual place, maybe JACK is not installed")
             }
         }
-        HEADERS += src/sound/jack/sound.h
-        SOURCES += src/sound/jack/sound.cpp
+        HEADERS += $$HEADERS_JACK
+        SOURCES += $$SOURCES_JACK
         DEFINES += WITH_JACK
         DEFINES += JACK_REPLACES_COREAUDIO
         INCLUDEPATH += /usr/local/include
@@ -297,8 +301,8 @@ win32 {
     } else {
         message(JACK Audio Interface Enabled.)
 
-        HEADERS += src/sound/jack/sound.h
-        SOURCES += src/sound/jack/sound.cpp
+        HEADERS += $$HEADERS_JACK
+        SOURCES += $$SOURCES_JACK
 
         contains(CONFIG, "raspijamulus") {
             message(Using JACK Audio in raspijamulus.sh mode.)