From b13eaaccd0c197a8d60edc32327dd219d13256cf Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Fri, 7 Aug 2020 13:40:28 -0400 Subject: [PATCH] Added code to linux build script to also build GTK3/SDL2 version of fceux GUI in addition to the QT5/SDL2 version. Only the Linux pipeline will attempt to build and package both the GTK and QT GUIs. The MacOSX will only build and pacakge QT version. --- pipelines/debpkg.pl | 4 +++- pipelines/linux_build.sh | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pipelines/debpkg.pl b/pipelines/debpkg.pl index e0960679..1f4a0c15 100755 --- a/pipelines/debpkg.pl +++ b/pipelines/debpkg.pl @@ -10,7 +10,9 @@ my $PKG_OUTPUT_FILE="fceux-$VERSION-$ARCH.deb"; # Start by auto figuring out dependencies of the executable. # the rest of the package creation is trival. -my $SO_LIST=`objdump -x $INSTALL_PREFIX/usr/bin/fceux`; +my $SO_LIST=""; +$SO_LIST+=`objdump -x $INSTALL_PREFIX/usr/bin/fceux`; +$SO_LIST+=`objdump -x $INSTALL_PREFIX/usr/bin/fceux-gtk`; #print "$SO_LIST"; diff --git a/pipelines/linux_build.sh b/pipelines/linux_build.sh index 8da0b4e4..51a81b55 100755 --- a/pipelines/linux_build.sh +++ b/pipelines/linux_build.sh @@ -92,14 +92,24 @@ mkdir -p $INSTALL_PREFIX/usr; #scons --clean #scons GTK3=1 SYSTEM_LUA=1 SYSTEM_MINIZIP=1 CREATE_AVI=1 install --prefix=$INSTALL_PREFIX/usr echo "Num CPU: `nproc`"; -mkdir build; cd build; -#qmake PREFIX=$INSTALL_PREFIX/usr .. +mkdir buildQT; cd buildQT; cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ .. -make -j `nproc` +make -j `nproc` +make install + +cd ..; +mkdir buildGTK; cd buildGTK; +cmake \ + -DGTK=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + .. +make -j `nproc` make install # Install Files