From 487a0902f471b29a73f62c822b885a457abc57db Mon Sep 17 00:00:00 2001 From: dreamer Date: Thu, 5 Dec 2024 10:43:07 +0100 Subject: [PATCH 1/3] install winget and jack2 on windews. add MSVC include path --- .github/workflows/cmake.yml | 12 ++++++++++++ CMakeLists.txt | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 36b1c5173..f8d0082e8 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -175,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 @@ -230,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 index 5cec502d6..5f7dbbcbd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,6 +331,7 @@ 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) @@ -339,6 +340,11 @@ if(APPLE) 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~/") From 601c7d283ccdecda115370a7a0376a0ac438344c Mon Sep 17 00:00:00 2001 From: dreamer Date: Thu, 5 Dec 2024 11:42:18 +0100 Subject: [PATCH 2/3] try windows tricks --- Libraries/JUCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/JUCE b/Libraries/JUCE index 2d4ffcf58..284f92913 160000 --- a/Libraries/JUCE +++ b/Libraries/JUCE @@ -1 +1 @@ -Subproject commit 2d4ffcf5838c051b8401a71c2259410d706df712 +Subproject commit 284f929131900a259e66649a3dc68a200cb6871b From e28052247995bd06a689bf0c0cc521b61acdd94e Mon Sep 17 00:00:00 2001 From: dreamer Date: Thu, 5 Dec 2024 13:21:18 +0100 Subject: [PATCH 3/3] HMODULE --- Libraries/JUCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/JUCE b/Libraries/JUCE index 284f92913..60f33c4af 160000 --- a/Libraries/JUCE +++ b/Libraries/JUCE @@ -1 +1 @@ -Subproject commit 284f929131900a259e66649a3dc68a200cb6871b +Subproject commit 60f33c4afdedf6da2b1fc84720b6cae6cb6eceb6