From 15ba6fd230ad7110889903202e4dd2e0f328f7d9 Mon Sep 17 00:00:00 2001
From: dreamer <1185977+dromer@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:44:24 +0100
Subject: [PATCH] Feature/jack4all juce winget (#4)

* install winget and jack2 on windews. add MSVC include path

* try windows tricks

* HMODULE
---
 .github/workflows/cmake.yml | 12 ++++++++++++
 CMakeLists.txt              |  6 ++++++
 Libraries/JUCE              |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

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~/")
diff --git a/Libraries/JUCE b/Libraries/JUCE
index 2d4ffcf58..60f33c4af 160000
--- a/Libraries/JUCE
+++ b/Libraries/JUCE
@@ -1 +1 @@
-Subproject commit 2d4ffcf5838c051b8401a71c2259410d706df712
+Subproject commit 60f33c4afdedf6da2b1fc84720b6cae6cb6eceb6