From 9b0fb8efe49db72adbba68b341965a8a579990dd Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Fri, 10 Jul 2020 14:09:33 -0400 Subject: [PATCH] Moved MAC OSX build to cmake instead of qmake. --- pipelines/macOS_build.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pipelines/macOS_build.sh b/pipelines/macOS_build.sh index 32e70a83..75245b31 100755 --- a/pipelines/macOS_build.sh +++ b/pipelines/macOS_build.sh @@ -8,6 +8,8 @@ sw_vers SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd ); +INSTALL_PREFIX=/tmp/fceux + gcc --version echo '****************************************' @@ -34,15 +36,25 @@ brew install minizip export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig: -QMAKE=`find /usr/local -name qmake`; +#QMAKE=`find /usr/local -name qmake`; +QT_CMAKE=`find /usr/local -name Qt5Config.cmake` +echo $QT_CMAKE; +export Qt5_DIR=`dirname $QT_CMAKE`; +echo "Qt5_DIR=$Qt5_DIR"; echo '**************************' echo '*** Building Project ***' echo '**************************' mkdir build; cd build; -$QMAKE .. -make +#$QMAKE .. +cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + .. +make +make install # Debug via ssh if necessary if [ ! -z $APPVEYOR_SSH_BLOCK ]; then