From c2c76de841fcfd3353509a5eb2db896df5d7b6b3 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 23 May 2021 06:32:29 -0400 Subject: [PATCH] Reverted Qt windows build to use Qt 5.15 instead of Qt 6.0. Qt6 needs a little more time to stablize. --- pipelines/qwin64_build.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pipelines/qwin64_build.bat b/pipelines/qwin64_build.bat index 793a5be4..763e775f 100644 --- a/pipelines/qwin64_build.bat +++ b/pipelines/qwin64_build.bat @@ -2,8 +2,8 @@ set PROJECT_ROOT=%~dp0.. set CWD=%CD% -REM call "C:\Qt\5.15\msvc2019_64\bin\qtenv2.bat" -call "C:\Qt\6.0\msvc2019_64\bin\qtenv2.bat" +call "C:\Qt\5.15\msvc2019_64\bin\qtenv2.bat" +REM call "C:\Qt\6.0\msvc2019_64\bin\qtenv2.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" cd %CWD% @@ -33,7 +33,7 @@ set SDL_INSTALL_PREFIX=%CD% REM cmake -h REM cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% .. -cmake -DQT6=1 -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% .. +cmake -DQT6=0 -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% .. REM nmake msbuild /m fceux.sln /p:Configuration=Release