Reverted Qt windows build to use Qt 5.15 instead of Qt 6.0. Qt6 needs a little more time to stablize.

This commit is contained in:
mjbudd77 2021-05-23 06:32:29 -04:00
parent af1fe48655
commit c2c76de841
1 changed files with 3 additions and 3 deletions

View File

@ -2,8 +2,8 @@
set PROJECT_ROOT=%~dp0.. set PROJECT_ROOT=%~dp0..
set CWD=%CD% set CWD=%CD%
REM call "C:\Qt\5.15\msvc2019_64\bin\qtenv2.bat" call "C:\Qt\5.15\msvc2019_64\bin\qtenv2.bat"
call "C:\Qt\6.0\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" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
cd %CWD% cd %CWD%
@ -33,7 +33,7 @@ set SDL_INSTALL_PREFIX=%CD%
REM cmake -h REM cmake -h
REM cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% .. 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 REM nmake
msbuild /m fceux.sln /p:Configuration=Release msbuild /m fceux.sln /p:Configuration=Release