[Scummvm-git-logs] scummvm master -> 3e94325df9d953e76374b4f00922a7f11986159e
bluegr
bluegr at gmail.com
Sun Mar 15 23:29:23 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3e94325df9 BACKENDS: Allow compiling certain backends for standard Linux platforms
Commit: 3e94325df9d953e76374b4f00922a7f11986159e
https://github.com/scummvm/scummvm/commit/3e94325df9d953e76374b4f00922a7f11986159e
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-03-16T01:29:20+02:00
Commit Message:
BACKENDS: Allow compiling certain backends for standard Linux platforms
Changed paths:
backends/events/gph/gph-events.cpp
backends/platform/gph/gph-backend.cpp
backends/platform/maemo/maemo.cpp
backends/platform/openpandora/op-backend.cpp
configure
diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 629de53585..bcf307a8c6 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -145,6 +145,40 @@ enum {
BUTTON_HELP2 = 54
};
+#else
+
+/* Main Joystick Button Mappings */
+enum {
+ /* Joystick Buttons */
+ BUTTON_A = 0,
+ BUTTON_B = 1,
+ BUTTON_X = 2,
+ BUTTON_Y = 3,
+ BUTTON_L = 4,
+ BUTTON_R = 5,
+ BUTTON_SELECT = 6,
+ BUTTON_MENU = 7,
+ BUTTON_CLICK = 8 // Stick Click
+};
+
+enum {
+ /* Unused Joystick Buttons */
+ BUTTON_VOLUP = 51,
+ BUTTON_VOLDOWN = 52,
+ BUTTON_UP = 53,
+ BUTTON_UPLEFT = 54,
+ BUTTON_LEFT = 55,
+ BUTTON_DOWNLEFT = 56,
+ BUTTON_DOWN = 57,
+ BUTTON_DOWNRIGHT = 58,
+ BUTTON_RIGHT = 59,
+ BUTTON_UPRIGHT = 60,
+ BUTTON_HOME = 61, // Home
+ BUTTON_HOLD = 62, // Hold (on Power)
+ BUTTON_HELP = 63, // Help I
+ BUTTON_HELP2 = 64 // Help II
+};
+
#endif
enum {
diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp
index 340b906dba..9bb1a9a29c 100644
--- a/backends/platform/gph/gph-backend.cpp
+++ b/backends/platform/gph/gph-backend.cpp
@@ -153,6 +153,7 @@ void OSystem_GPH::initBackend() {
}
void OSystem_GPH::initSDL() {
+#ifdef SDL_INIT_EVENTTHREAD
// Check if SDL has not been initialized
if (!_initedSDL) {
@@ -166,6 +167,8 @@ void OSystem_GPH::initSDL() {
_initedSDL = true;
}
+#endif
+ OSystem_SDL::initSDL();
}
void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 9231c7dfd5..87975b4eac 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -30,6 +30,7 @@
#include "backends/platform/maemo/maemo.h"
#include "backends/events/maemosdl/maemosdl-events.h"
#include "backends/graphics/maemosdl/maemosdl-graphics.h"
+#include "backends/keymapper/action.h"
#include "backends/keymapper/keymapper.h"
#include "backends/keymapper/keymapper-defaults.h"
#include "common/textconsole.h"
diff --git a/backends/platform/openpandora/op-backend.cpp b/backends/platform/openpandora/op-backend.cpp
index c166b50a1d..7606141077 100644
--- a/backends/platform/openpandora/op-backend.cpp
+++ b/backends/platform/openpandora/op-backend.cpp
@@ -141,6 +141,7 @@ void OSystem_OP::initBackend() {
}
void OSystem_OP::initSDL() {
+#ifdef SDL_INIT_EVENTTHREAD
// Check if SDL has not been initialized
if (!_initedSDL) {
@@ -154,6 +155,8 @@ void OSystem_OP::initSDL() {
_initedSDL = true;
}
+#endif
+ OSystem_SDL::initSDL();
}
void OSystem_OP::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
diff --git a/configure b/configure
index 8533415d4a..e158ff578d 100755
--- a/configure
+++ b/configure
@@ -2858,9 +2858,6 @@ case $_host_os in
append_var CXXFLAGS "`getconf LFS_CFLAGS 2>/dev/null`"
fi
;;
- maemo)
- append_var DEFINES "-DMAEMO"
- ;;
mingw*)
append_var DEFINES "-DWIN32"
# append_var DEFINES "-D__USE_MINGW_ANSI_STDIO=0" # Modern MinGW does not need it
@@ -3120,7 +3117,6 @@ if test -n "$_host"; then
_strip=$_host-strip
;;
dingux)
- append_var DEFINES "-DDINGUX"
append_var DEFINES "-DDISABLE_DOSBOX_OPL"
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
append_var CXXFLAGS "-msoft-float"
@@ -3227,7 +3223,7 @@ if test -n "$_host"; then
gcw0)
_sysroot=`$CXX --print-sysroot`
_sdlpath=$_sysroot/usr/bin
- append_var DEFINES "-DDINGUX -DGCW0"
+ append_var DEFINES "-DGCW0"
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
append_var CXXFLAGS "-mips32"
_backend="dingux"
@@ -3239,7 +3235,6 @@ if test -n "$_host"; then
_optimization_level=-O3
_vkeybd=yes
_vorbis=no
- _sdlconfig=sdl-config
_port_mk="backends/platform/dingux/dingux.mk"
;;
gp2x)
@@ -3294,7 +3289,6 @@ if test -n "$_host"; then
append_var CXXFLAGS "-mcpu=arm926ej-s"
append_var CXXFLAGS "-fomit-frame-pointer"
append_var INCLUDES "-I/usr/X11R6/include"
- append_var LIBS "-lX11"
append_var LIBS "-L/usr/lib"
_backend="maemo"
@@ -3353,12 +3347,6 @@ if test -n "$_host"; then
_mt32emu=no
;;
openpandora)
- append_var DEFINES "-DOPENPANDORA"
- append_var DEFINES "-DREDUCE_MEMORY_USAGE"
- if test "$_release_build" = no; then
- append_var DEFINES "-DOP_DEBUG"
- fi
-
# Use -O3 on the OpenPandora for optimized builds.
if test "$_optimizations" = yes; then
_optimization_level=-O3
@@ -3553,6 +3541,7 @@ case $_backend in
;;
dingux)
append_var DEFINES "-DDINGUX"
+ _sdlconfig=sdl-config
_sdl=auto
;;
ds)
@@ -3568,6 +3557,7 @@ case $_backend in
if test "$_debug_build" = yes; then
append_var DEFINES "-DGPH_DEBUG"
fi
+ _sdlconfig=sdl-config
_sdl=auto
;;
iphone)
@@ -3590,6 +3580,8 @@ case $_backend in
;;
maemo)
append_var DEFINES "-DMAEMO"
+ append_var LIBS "-lX11"
+ _sdlconfig=sdl-config
_sdl=auto
;;
n64)
@@ -3604,6 +3596,11 @@ case $_backend in
append_var DEFINES "-DUSE_NULL_DRIVER"
;;
openpandora)
+ append_var DEFINES "-DOPENPANDORA"
+ append_var DEFINES "-DREDUCE_MEMORY_USAGE"
+ if test "$_release_build" = no; then
+ append_var DEFINES "-DOP_DEBUG"
+ fi
_sdl=auto
;;
ps2)
More information about the Scummvm-git-logs
mailing list