Update for Windows

blackboxaudio · Nov 8, 2024 · 365f465 · 365f465
1 parent 5fd2364
commit 365f465
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [macos-latest]
+        os: [windows-latest, macos-latest]
 
     env:
       BUILD_TYPE: Release
@@ -19,31 +19,35 @@ jobs:
     - name: "Preparation"
       uses: actions/checkout@v2
 
-    - name: "1/6: Clone (JUCE)"
+    - name: "1/7: Clone (JUCE)"
       uses: actions/checkout@v2
       with:
         repository: juce-framework/JUCE
-        ref: 545e9f353a6a336c5d1616796024b30d4bbed04b
+        ref: 2f980209cc4091a4490bb1bafc5d530f16834e58
         path: ${{runner.workspace}}/rotor/JUCE
 
     # JUCE
-    - name: "2/6: Configuration (JUCE)"
+    - name: "2/7: Preprocessor Definitions"
+      working-directory: ${{runner.workspace}}/rotor/JUCE
+      run: perl -i -pe "s/#define JUCE_MODAL_LOOPS_PERMITTED.*/#define JUCE_MODAL_LOOPS_PERMITTED 1/" modules/juce_core/system/juce_PlatformDefs.h
+
+    - name: "3/7: Configuration (JUCE)"
       working-directory: ${{runner.workspace}}/rotor/JUCE
       run: cmake -B bin .
 
-    - name: "3/6: Build (JUCE)"
+    - name: "4/7: Build (JUCE)"
       working-directory: ${{runner.workspace}}/rotor/JUCE
       run: cmake --build bin
 
     # Rotor
-    - name: "4/6: Precompilation (Rotor)"
+    - name: "5/7: Precompilation (Rotor)"
       working-directory: ${{runner.workspace}}/rotor
       run: chmod +x ./scripts/precompile.sh && ./scripts/precompile.sh
 
-    - name: "5/6: Configuration (Rotor)"
+    - name: "6/7: Configuration (Rotor)"
       working-directory: ${{runner.workspace}}/rotor
       run: cmake -B bin .
 
-    - name: "6/6: Build (Rotor)"
+    - name: "7/7: Build (Rotor)"
       working-directory: ${{runner.workspace}}/rotor
       run: cmake --build bin --config ${{ env.BUILD_TYPE }} --target Rotor_All
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -13,7 +13,7 @@ BUILD_TYPE=Debug
 COMPANY_NAME="Black Box Audio"
 PLUGIN_NAME=Rotor
 
-JUCE_CODE_COMMIT=545e9f353a6a336c5d1616796024b30d4bbed04b
+JUCE_CODE_COMMIT=2f980209cc4091a4490bb1bafc5d530f16834e58
 
 for i in "$@"; do
     case $i in
@@ -62,6 +62,10 @@ fi
 if [ ! -d "./juce/build" ]; then
     cd ./juce
 
+    def_name="JUCE_MODAL_LOOPS_PERMITTED"
+    def_value="1"
+    perl -i -pe "s/#define $def_name.*/#define $def_name $def_value/" modules/juce_core/system/juce_PlatformDefs.h
+
     echo -e "Configuring JUCE...\n"
     cmake -B bin .
     echo -e "\n[Success] Configured JUCE build!\n"