diff options
author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-04-03 12:15:52 +0000 |
---|---|---|
committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-04-03 12:15:52 +0000 |
commit | c2f06582cba5139f11d223ec5b371eefd7a10e24 (patch) | |
tree | 17d8a5ccecdb3723fda29197f89ec14fe6b56353 /emulators | |
parent | Update to 1.14.2 (diff) |
emulators/emu64: fix build on PPC and ARM
char on PPC and ARM is unsigned.
PR: 245200
MFH: 2020Q2 (build fix blanket)
Notes
Notes:
svn path=/head/; revision=530485
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/emu64/Makefile | 4 | ||||
-rw-r--r-- | emulators/emu64/files/patch-src_c64__class.cpp | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/emulators/emu64/Makefile b/emulators/emu64/Makefile index 772b75026ccb..0f8488545408 100644 --- a/emulators/emu64/Makefile +++ b/emulators/emu64/Makefile @@ -15,11 +15,13 @@ LIB_DEPENDS= libquazip5.so:archivers/quazip \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg -USES= compiler:c++11-lang desktop-file-utils gl pkgconfig \ +USES= compiler:c++11-lang desktop-file-utils dos2unix gl pkgconfig \ qmake:outsource qt:5 sdl USE_GL= gl glu USE_QT= core gui widgets buildtools_build linguisttools_build +DOS2UNIX_FILES= src/c64_class.cpp + USE_SDL= sdl2 image2 USE_GITHUB= yes GH_ACCOUNT= ThKattanek diff --git a/emulators/emu64/files/patch-src_c64__class.cpp b/emulators/emu64/files/patch-src_c64__class.cpp new file mode 100644 index 000000000000..33a7b1c6b2dd --- /dev/null +++ b/emulators/emu64/files/patch-src_c64__class.cpp @@ -0,0 +1,11 @@ +--- src/c64_class.cpp.orig 2020-04-03 11:33:28 UTC ++++ src/c64_class.cpp +@@ -1757,7 +1757,7 @@ void C64Class::SetFullscreenAspectRatio(bool enable) + void C64Class::AnalyzeSDLEvent(SDL_Event *event) + { + static bool joy_center_flag = true; +- static char joy_axis_tbl[5] = {1,1,0,0,-1}; ++ static signed char joy_axis_tbl[5] = {1,1,0,0,-1}; + + SDL_Keymod keymod; + |