Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/jack4all #2005

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
19 changes: 17 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,13 @@ set(JUCE_COMPILE_DEFINITIONS
JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
JUCE_USE_XRENDER=1
JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS=0
JUCE_JACK=1
JUCE_JACK_CLIENT_NAME="plugdata"
)

if(LINUX)
list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_ALSA=1 JUCE_JACK=1 JUCE_JACK_CLIENT_NAME="plugdata")
list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_ALSA=1)
elseif(UNIX AND NOT APPLE) # BSD
list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_JACK=1 JUCE_JACK_CLIENT_NAME="plugdata")
add_compile_definitions(BSD=1 ENABLE_OPUS=0)
endif()

Expand Down Expand Up @@ -330,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~/")
Expand Down