Install FLTK/STK from Toby ONLY on 64-bit MinGW (due to 32-bit C++ pr…

…oblems)
FyiurAmron · Jun 29, 2024 · cda8693 · cda8693
1 parent 74a89b9
commit cda8693
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -197,13 +197,10 @@ jobs:
             libmpc3                             \
             mingw-w64                           \
             mingw-w64-tools                     \
-            binutils-mingw-w64                  \
+            glib2-mingw-w64                     \
             fftw-mingw-w64                      \
             flac-mingw-w64                      \
-            fltk-mingw-w64                      \
             fluidsynth-mingw-w64                \
-            gcc-mingw-w64                       \
-            glib2-mingw-w64                     \
             lame-mingw-w64                      \
             libgig-mingw-w64                    \
             libsamplerate-mingw-w64             \
@@ -214,9 +211,15 @@ jobs:
             portaudio-mingw-w64                 \
             qt5base-mingw-w64                   \
             sdl2-mingw-w64                      \
-            stk-mingw-w64                       \
             file
-          rm -rf /var/lib/apt/lists/*
+#      - name: Install FLTK/STK from Toby ONLY on 64-bit MinGW (due to 32-bit C++ problems)
+#        if: ${{ matrix.arch == '64' }}
+#        run: |
+          apt-get install -y --no-install-recommends \
+            fltk-mingw-w64                      \
+            stk-mingw-w64
+      - name: APT cleanup
+        run: rm -rf /var/lib/apt/lists/*
       - name: Configure git
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Check out
@@ -233,15 +236,14 @@ jobs:
             ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
             ccache-${{ github.job }}-${{ matrix.arch }}-
           path: ~/.ccache
-### those are actually not needed; new Ubuntu/MinGW ship those as default
-#      - name: Install 32-bit POSIX libs
-#        if: ${{ matrix.arch == '32' }}
-#        run: |
-#          apt-get install g++-mingw-w64-i686-posix
-#      - name: Install 64-bit POSIX libs
-#        if: ${{ matrix.arch == '64' }}
-#        run: |
-#          apt-get install g++-mingw-w64-x86-64-posix
+      - name: Install 32-bit POSIX MinGW
+        if: ${{ matrix.arch == '32' }}
+        run: |
+          apt-get install g++-mingw-w64-i686-posix
+      - name: Install 64-bit POSIX MinGW
+        if: ${{ matrix.arch == '64' }}
+        run: |
+          apt-get install g++-mingw-w64-x86-64-posix
       - name: Configure
         run: |
           ccache --zero-stats