diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-05-09 03:37:51 -0700 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-05-20 18:53:46 -0700 |
| commit | f665ab1e4fdd3b7c3e1a7265fc4fd2207de5a76c (patch) | |
| tree | 61c362672b2752822ab24c8603a36d62389b5337 /build/appveyor | |
| parent | 65fee00aec8a149116b9b87105b7c07e6a1a41b0 (diff) | |
Enable Qt5 build on Windows.
Diffstat (limited to 'build/appveyor')
| -rw-r--r-- | build/appveyor/build_mixxx.bat | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/appveyor/build_mixxx.bat b/build/appveyor/build_mixxx.bat index ae5b79db76..1ef7887762 100644 --- a/build/appveyor/build_mixxx.bat +++ b/build/appveyor/build_mixxx.bat @@ -89,7 +89,7 @@ set WINLIB_DIR=%3 SET BIN_DIR=%WINLIB_DIR%\bin SET LIB_DIR=%WINLIB_DIR%\lib SET INCLUDE_DIR=%WINLIB_DIR%\include -set QT_VERSION=4.8.7 +set QT_VERSION=5.10.1 SET QTDIR=%WINLIB_DIR%\Qt-%QT_VERSION% if NOT EXIST "%BIN_DIR%\scons.py" ( @@ -140,8 +140,7 @@ set CXXFLAGS=/MP /FS /EHsc /Zc:threadSafeInit- set CFLAGS=/MP /FS /EHsc /Zc:threadSafeInit- set PATH=%BIN_DIR%;%PATH% -REM TODO(rryan): Windows is stuck on Qt4 until mixxxdj/buildserver#36 is fixed. -scons.py mixxx makerelease qt5=0 toolchain=msvs winlib=%WINLIB_DIR% build=%BUILD_TYPE% staticlibs=1 staticqt=1 debug_assertions_fatal=1 verbose=0 machine=%MACHINE_TYPE% qtdir=%QTDIR% hss1394=1 mediafoundation=1 opus=1 localecompare=1 optimize=fastbuild virtualize=0 test=1 qt_sqlite_plugin=0 mssdk_dir="%MSSDK_DIR%" build_number_in_title_bar=0 bundle_pdbs=1 +scons.py mixxx makerelease toolchain=msvs winlib=%WINLIB_DIR% build=%BUILD_TYPE% staticlibs=1 staticqt=1 debug_assertions_fatal=1 verbose=0 machine=%MACHINE_TYPE% qtdir=%QTDIR% hss1394=1 mediafoundation=1 opus=1 localecompare=1 optimize=fastbuild virtualize=0 test=1 qt_sqlite_plugin=0 mssdk_dir="%MSSDK_DIR%" build_number_in_title_bar=0 bundle_pdbs=1 IF ERRORLEVEL 1 ( echo ============================== |