-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This switches the GUI from GTK3 to Qt. GTK3 is still available, but did not work fully in my testing. Qt is the default and recommended GUI, and it worked. By ericonr: - fix build for musl Closes: #27646 [via git-merge-pr]
- Loading branch information
1 parent
ea8bd86
commit 3ea776c
Showing
4 changed files
with
22 additions
and
142 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git src/drivers/Qt/HexEditor.cpp src/drivers/Qt/HexEditor.cpp | ||
index 8f078ac..010b2cf 100644 | ||
--- src/drivers/Qt/HexEditor.cpp | ||
+++ src/drivers/Qt/HexEditor.cpp | ||
@@ -43,6 +43,8 @@ | ||
#include "Qt/ConsoleUtilities.h" | ||
#include "Qt/ConsoleWindow.h" | ||
|
||
+#undef isascii | ||
+ | ||
static bool memNeedsCheck = false; | ||
static HexBookMarkManager_t hbm; | ||
static std::list <HexEditorDialog_t*> winList; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,14 @@ | ||
# Template file for 'fceux' | ||
pkgname=fceux | ||
version=2.2.3 | ||
revision=4 | ||
build_style=scons | ||
make_build_args="SYSTEM_LUA=1 RELEASE=1 GTK=0 GTK3=1" | ||
hostmakedepends="pkg-config" | ||
makedepends="zlib-devel lua51-devel SDL-devel gtk+3-devel gd-devel glu-devel" | ||
version=2.3.0 | ||
revision=1 | ||
wrksrc="fceux-fceux-$version" | ||
build_style=cmake | ||
hostmakedepends="pkg-config qt5-qmake qt5-host-tools" | ||
makedepends="zlib-devel lua51-devel SDL2-devel qt5-devel minizip-devel" | ||
short_desc="All in one NES/Famicom Emulator" | ||
maintainer="bra1nwave <brainwave@openmailbox.org>" | ||
license="GPL-2.0-or-later" | ||
homepage="http://www.fceux.com/" | ||
distfiles="${SOURCEFORGE_SITE}/fceultra/Source%20Code/${version}%20src/${pkgname}-${version}.src.tar.gz" | ||
checksum=4be6dda9a347f941809a3c4a90d21815b502384adfdd596adaa7b2daf088823e | ||
|
||
export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig" | ||
export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig" | ||
|
||
pre_build() { | ||
CPPFLAGS+=" $($PKG_CONFIG --cflags lua)" | ||
} | ||
|
||
do_install() { | ||
CPPFLAGS+=" $($PKG_CONFIG --cflags lua)" | ||
scons --prefix=${DESTDIR}/usr $make_build_args install | ||
} | ||
homepage="https://fceux.com/web/home.html" | ||
distfiles="https://github.com/TASVideos/fceux/archive/fceux-${version}.tar.gz" | ||
checksum=0d3b02b3f15032f7675acb95423fd81fae286615313dfbc58cdd4de2bce17f6e |