diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-04-11 16:36:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-11 16:36:17 +0200 |
| commit | 820889b9210e922ae85c1264ff2815d7e81b5464 (patch) | |
| tree | 59b6eed885c1e3bfda73873e05f2b23eb8322e92 | |
| parent | 1cdf0321249f244f08ed51d80a1346c786e59755 (diff) | |
| parent | 895a485fa88221ce7afe8edbdb605a51a9fa07dd (diff) | |
Merge pull request #3778 from JoergAtGithub/2.3_windows_local_buildfix
Fixed build settings for local Windows development environment
| -rw-r--r-- | .github/workflows/build.yml | 3 | ||||
| -rw-r--r-- | tools/windows_buildenv.bat | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c19c5d60c7..cd7dd0a220 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,9 @@ jobs: - name: Windows 2019 (MSVC) os: windows-2019 # TODO: Reenable FFmpeg after licensing issues have been clarified + # Attention: If you change the cmake_args for the Windows CI build, + # also adjust the for the local Windows build setup in + # ./tools/windows_buildenv.bat cmake_args: >- -DBULK=OFF -DFFMPEG=OFF diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index eae170dffe..8d03e7d530 100644 --- a/tools/windows_buildenv.bat +++ b/tools/windows_buildenv.bat @@ -176,12 +176,12 @@ REM Generate CMakeSettings.json which is read by MS Visual Studio to determine t CALL :AddCMakeVar2CMakeSettings_JSON "VCPKG_TARGET_TRIPLET" "STRING" "x64-windows" CALL :AddCMakeVar2CMakeSettings_JSON "BATTERY" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "BROADCAST" "BOOL" "True" - CALL :AddCMakeVar2CMakeSettings_JSON "BULK" "BOOL" "True" + CALL :AddCMakeVar2CMakeSettings_JSON "BULK" "BOOL" "False" CALL :AddCMakeVar2CMakeSettings_JSON "CMAKE_EXPORT_COMPILE_COMMANDS" "BOOL" "True" REM Replace all \ by \\ in CMAKE_PREFIX_PATH CALL :AddCMakeVar2CMakeSettings_JSON "CMAKE_PREFIX_PATH" "STRING" "!CMAKE_PREFIX_PATH:\=\\!" CALL :AddCMakeVar2CMakeSettings_JSON "DEBUG_ASSERTIONS_FATAL" "BOOL" "True" - CALL :AddCMakeVar2CMakeSettings_JSON "FFMPEG" "BOOL" "True" + CALL :AddCMakeVar2CMakeSettings_JSON "FFMPEG" "BOOL" "False" CALL :AddCMakeVar2CMakeSettings_JSON "HID" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "HSS1394" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "KEYFINDER" "BOOL" "False" @@ -189,12 +189,14 @@ REM Generate CMakeSettings.json which is read by MS Visual Studio to determine t CALL :AddCMakeVar2CMakeSettings_JSON "LILV" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "MAD" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "MEDIAFOUNDATION" "BOOL" "True" + CALL :AddCMakeVar2CMakeSettings_JSON "MODPLUG" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "OPUS" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "OPTIMIZE" "STRING" "%1" CALL :AddCMakeVar2CMakeSettings_JSON "QTKEYCHAIN" "BOOL" "True" CALL :AddCMakeVar2CMakeSettings_JSON "STATIC_DEPS" "BOOL" "False" - SET variableElementTermination= CALL :AddCMakeVar2CMakeSettings_JSON "VINYLCONTROL" "BOOL" "True" + SET variableElementTermination= + CALL :AddCMakeVar2CMakeSettings_JSON "WAVPACK" "BOOL" "True" >>%CMakeSettings% echo ] >>%CMakeSettings% echo }!configElementTermination! GOTO :EOF |