From 69a761a47784195b28dd0b70e7a340f9e2bd53f7 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Fri, 10 Jul 2020 14:57:55 -0400 Subject: [PATCH] More Cmake fixes between linux and mac os --- pipelines/linux_build.sh | 1 + pipelines/macOS_build.sh | 5 ++++- src/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pipelines/linux_build.sh b/pipelines/linux_build.sh index 1ad6d8ce..8da0b4e4 100755 --- a/pipelines/linux_build.sh +++ b/pipelines/linux_build.sh @@ -55,6 +55,7 @@ pkg-config --cflags --libs minizip # GTK+-2 is no longer needed #sudo apt-get install libgtk2.0-dev +# GTK3 was retired in favor of cross platform QT ## Install GTK+-3 #echo '****************************************' #echo 'Install Dependency libgtk-3-dev' diff --git a/pipelines/macOS_build.sh b/pipelines/macOS_build.sh index fd029993..19a9fbd8 100755 --- a/pipelines/macOS_build.sh +++ b/pipelines/macOS_build.sh @@ -8,6 +8,9 @@ sw_vers SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd ); +NPROC=`getconf _NPROCESSORS_ONLN`; +echo "Number of Processors: $NPROC"; + INSTALL_PREFIX=/tmp/fceux gcc --version @@ -53,7 +56,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ .. || exit 1 -make || exit 1 +make -j $NPROC || exit 1 make install || exit 1 # Debug via ssh if necessary diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 186ad2d1..afb9a9a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,7 @@ else(WIN32) find_package(PkgConfig REQUIRED) find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED) find_package(OpenGL REQUIRED) - find_package(zlib REQUIRED) + find_package(ZLIB REQUIRED) add_definitions( ${Qt5Widgets_DEFINITIONS} ) include_directories( ${Qt5Widgets_INCLUDE_DIRS} )