Feature/jack4all juce (#6)

* use modded juce * fix imports * move JUCE_JACK out of other if tree * jack4all * use new JUCE commit; install jack with homebrew * use proper include path on macOS * specify different include dirs for macOS * Feature/jack4all juce winget (#4) * install winget and jack2 on windews. add MSVC include path * try windows tricks * HMODULE --------- Co-authored-by: dromer <[email protected]>
Wasted-Audio · Dec 5, 2024 · eaac7d8 · eaac7d8
1 parent a4cbd38
commit eaac7d8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -16,12 +16,14 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-
       - name: ccache
         uses: hendrikmuhs/[email protected]
         with:
           key: macos
 
+      - name: install jack
+        run: brew install jack
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -99,6 +101,9 @@ jobs:
         with:
           key: macos-legacy
 
+      - name: install jack
+        run: brew install jack
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -170,6 +175,12 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Install winget
+        uses: Cyberboss/install-winget@v1
+
+      - name: Install jack
+        run: winget install jack2 --disable-interactivity --accept-source-agreements
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -225,6 +236,12 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Install winget
+        uses: Cyberboss/install-winget@v1
+
+      - name: Install jack
+        run: winget install jack2 --disable-interactivity --accept-source-agreements
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -331,6 +331,20 @@ include_directories(/usr/local/include)
 link_directories(/usr/local/lib)
 endif()
 
+# macOS includes for jack
+if(APPLE)
+  if(MACOS_LEGACY)
+    include_directories(/usr/local/include)
+  else()
+    include_directories(/opt/homebrew/include)
+  endif()
+endif()
+
+# Windows include for jack
+if(MSVC)
+  include_directories("C:\\Program Files\\JACK2\\include")
+endif()
+
 list(APPEND PLUGDATA_COMPILE_DEFINITIONS JUCE_MODAL_LOOPS_PERMITTED=1)
 
 list(APPEND PLUGDATA_INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/ELSE/sfont~/")

diff --git a/Libraries/JUCE b/Libraries/JUCE
+1 −1		modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp
+14 −13		modules/juce_audio_devices/juce_audio_devices.cpp
+1 −1		modules/juce_audio_devices/juce_audio_devices.h
+15 −0		modules/juce_audio_devices/native/juce_JackAudio.cpp