Merge branch '2.3' of github.com:mixxxdj/mixxx

Holzhaus · Mar 19, 2021 · 81a5705 · 81a5705
2 parents 69c46a9 + 7866dea
commit 81a5705
Show file tree

Hide file tree

Showing 13 changed files with 199 additions and 126 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,6 +14,7 @@ jobs:
             os: ubuntu-20.04
             cmake_args: >-
               -DWARNINGS_FATAL=ON
+              -DBULK=ON
               -DFFMPEG=ON
               -DKEYFINDER=ON
               -DLOCALECOMPARE=ON
@@ -35,6 +36,7 @@ jobs:
           - name: macOS 10.15
             os: macos-10.15
             cmake_args: >-
+              -DBULK=ON
               -DCOREAUDIO=ON
               -DHSS1394=ON
               -DMACOS_BUNDLE=ON
@@ -52,7 +54,10 @@ jobs:
             qt_qpa_platform: offscreen
           - name: Windows 2019 (MSVC)
             os: windows-2019
+            # TODO: Reenable FFmpeg after licensing issues have been clarified
             cmake_args: >-
+              -DBULK=OFF
+              -DFFMPEG=OFF
               -DHSS1394=ON
               -DKEYFINDER=OFF
               -DLOCALECOMPARE=ON
@@ -195,18 +200,18 @@ jobs:
         cmake
         -G "${{ matrix.cmake_generator }}"
         -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }}
-        "-DCMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}"
+        -DCMAKE_PREFIX_PATH="${{ env.CMAKE_PREFIX_PATH }}"
         -DDEBUG_ASSERTIONS_FATAL=ON
         -DQt5_DIR=${{ env.QT_PATH }} ${{ matrix.cmake_args }} ${{ env.CMAKE_ARGS_EXTRA }}
         -DBATTERY=ON
         -DBROADCAST=ON
-        -DBULK=ON
         -DHID=ON
         -DLILV=ON
         -DOPUS=ON
         -DQTKEYCHAIN=ON
         -DVINYLCONTROL=ON
         -DCMAKE_VERBOSE_MAKEFILE=OFF
+        -L
         ..
       working-directory: build
       env: