From 8d93015a5673a8c3c103e723940d4ead8bff4e4c Mon Sep 17 00:00:00 2001 From: harry Date: Sat, 24 Feb 2024 18:19:34 -0500 Subject: [PATCH] Put win64 auto build back to Qt5 until the Qt6 build issue can be solved. --- 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 688972ef..956212dc 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.5\msvc2019_64\bin\qtenv2.bat" +call "C:\Qt\5.15\msvc2019_64\bin\qtenv2.bat" +REM call "C:\Qt\6.5\msvc2019_64\bin\qtenv2.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" cd /d %CWD% @@ -50,7 +50,7 @@ IF DEFINED FCEU_RELEASE_VERSION (set PUBLIC_RELEASE=1) REM cmake -h REM cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% .. -cmake -DQT=6 -DPUBLIC_RELEASE=%PUBLIC_RELEASE% -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% -DLIBARCHIVE_INSTALL_PREFIX=%LIBARCHIVE_INSTALL_PREFIX% -DUSE_LIBAV=1 -DFFMPEG_INSTALL_PREFIX=%FFMPEG_INSTALL_PREFIX% -G"Visual Studio 16" -T"v142" .. +cmake -DQT=5 -DPUBLIC_RELEASE=%PUBLIC_RELEASE% -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% -DLIBARCHIVE_INSTALL_PREFIX=%LIBARCHIVE_INSTALL_PREFIX% -DUSE_LIBAV=1 -DFFMPEG_INSTALL_PREFIX=%FFMPEG_INSTALL_PREFIX% -G"Visual Studio 16" -T"v142" .. REM nmake msbuild /m fceux.sln /p:Configuration=Release