Skip to content

Commit eaac7d8

Browse files
dromerdromer
andauthored
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]>
1 parent a4cbd38 commit eaac7d8

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

.github/workflows/cmake.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ jobs:
1616
with:
1717
submodules: recursive
1818
fetch-depth: 0
19-
2019
- name: ccache
2120
uses: hendrikmuhs/[email protected]
2221
with:
2322
key: macos
2423

24+
- name: install jack
25+
run: brew install jack
26+
2527
- name: Create Build Environment
2628
run: cmake -E make_directory ${{github.workspace}}/build
2729

@@ -99,6 +101,9 @@ jobs:
99101
with:
100102
key: macos-legacy
101103

104+
- name: install jack
105+
run: brew install jack
106+
102107
- name: Create Build Environment
103108
run: cmake -E make_directory ${{github.workspace}}/build
104109

@@ -170,6 +175,12 @@ jobs:
170175
submodules: recursive
171176
fetch-depth: 0
172177

178+
- name: Install winget
179+
uses: Cyberboss/install-winget@v1
180+
181+
- name: Install jack
182+
run: winget install jack2 --disable-interactivity --accept-source-agreements
183+
173184
- name: Create Build Environment
174185
run: cmake -E make_directory ${{github.workspace}}/build
175186

@@ -225,6 +236,12 @@ jobs:
225236
submodules: recursive
226237
fetch-depth: 0
227238

239+
- name: Install winget
240+
uses: Cyberboss/install-winget@v1
241+
242+
- name: Install jack
243+
run: winget install jack2 --disable-interactivity --accept-source-agreements
244+
228245
- name: Create Build Environment
229246
run: cmake -E make_directory ${{github.workspace}}/build
230247

CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,20 @@ include_directories(/usr/local/include)
331331
link_directories(/usr/local/lib)
332332
endif()
333333

334+
# macOS includes for jack
335+
if(APPLE)
336+
if(MACOS_LEGACY)
337+
include_directories(/usr/local/include)
338+
else()
339+
include_directories(/opt/homebrew/include)
340+
endif()
341+
endif()
342+
343+
# Windows include for jack
344+
if(MSVC)
345+
include_directories("C:\\Program Files\\JACK2\\include")
346+
endif()
347+
334348
list(APPEND PLUGDATA_COMPILE_DEFINITIONS JUCE_MODAL_LOOPS_PERMITTED=1)
335349

336350
list(APPEND PLUGDATA_INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/ELSE/sfont~/")

0 commit comments

Comments
 (0)