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

More Cmake fixes between linux and mac os

This commit is contained in:
mjbudd77 2020-07-10 14:57:55 -04:00
parent cc4ce19784
commit 69a761a477
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pipelines/linux_build.sh
View File

@ -55,6 +55,7 @@ pkg-config --cflags --libs minizip
# GTK+-2 is no longer needed # GTK+-2 is no longer needed
#sudo apt-get install libgtk2.0-dev #sudo apt-get install libgtk2.0-dev
# GTK3 was retired in favor of cross platform QT
## Install GTK+-3 ## Install GTK+-3
#echo '****************************************' #echo '****************************************'
#echo 'Install Dependency libgtk-3-dev' #echo 'Install Dependency libgtk-3-dev'

5
pipelines/macOS_build.sh
View File

@ -8,6 +8,9 @@ sw_vers
SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd ); SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd );
NPROC=`getconf _NPROCESSORS_ONLN`;
echo "Number of Processors: $NPROC";
INSTALL_PREFIX=/tmp/fceux INSTALL_PREFIX=/tmp/fceux
gcc --version gcc --version
@ -53,7 +56,7 @@ cmake \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
.. || exit 1 .. || exit 1
make || exit 1 make -j $NPROC || exit 1
make install || exit 1 make install || exit 1
# Debug via ssh if necessary # Debug via ssh if necessary

2
src/CMakeLists.txt
View File

@ -21,7 +21,7 @@ else(WIN32)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED) find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(zlib REQUIRED) find_package(ZLIB REQUIRED)
add_definitions( ${Qt5Widgets_DEFINITIONS} ) add_definitions( ${Qt5Widgets_DEFINITIONS} )
include_directories( ${Qt5Widgets_INCLUDE_DIRS} ) include_directories( ${Qt5Widgets_INCLUDE_DIRS} )