ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set Windows Qt appveyor build to use Qt6. Build fix for Mac OSX pipeline using Qt6.

This commit is contained in:
mjbudd77 2021-04-11 21:26:46 -04:00
parent 229705f693
commit a3c73c5a4d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pipelines/macOS_build.sh
View File

@ -52,9 +52,11 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:
if [ $QT_MAJOR == 6 ]; then if [ $QT_MAJOR == 6 ]; then
export Qt6_DIR=`brew --prefix qt6`; export Qt6_DIR=`brew --prefix qt6`;
echo "Qt6_DIR=$Qt6_DIR"; echo "Qt6_DIR=$Qt6_DIR";
USE_QT6=1;
else else
export Qt5_DIR=`brew --prefix qt5`; export Qt5_DIR=`brew --prefix qt5`;
echo "Qt5_DIR=$Qt5_DIR"; echo "Qt5_DIR=$Qt5_DIR";
USE_QT6=0;
fi fi
echo '**************************' echo '**************************'
@ -73,6 +75,7 @@ cmake \
-DCPACK_PACKAGE_VERSION_MAJOR=$FCEUX_VERSION_MAJOR \ -DCPACK_PACKAGE_VERSION_MAJOR=$FCEUX_VERSION_MAJOR \
-DCPACK_PACKAGE_VERSION_MINOR=$FCEUX_VERSION_MINOR \ -DCPACK_PACKAGE_VERSION_MINOR=$FCEUX_VERSION_MINOR \
-DCPACK_PACKAGE_VERSION_PATCH=$FCEUX_VERSION_PATCH \ -DCPACK_PACKAGE_VERSION_PATCH=$FCEUX_VERSION_PATCH \
-DQT6=$USE_QT6 \
.. || exit 1 .. || exit 1
make -j $NPROC || exit 1 make -j $NPROC || exit 1
sudo make install || exit 1 sudo make install || exit 1

4
pipelines/qwin64_build.bat
View File

@ -2,8 +2,8 @@
set PROJECT_ROOT=%~dp0.. set PROJECT_ROOT=%~dp0..
set CWD=%CD% set CWD=%CD%
REM call "C:\Qt\6.0\msvc2019_64\bin\qtenv2.bat" 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"
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%