[Scummvm-cvs-logs] scummvm master -> 38ed8d2fcda04e8fb84b73416320fbf2344b5fd3
djwillis
John.Willis at Distant-earth.com
Mon Apr 11 19:27:22 CEST 2011
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
18e35a638d OPENPANDORA: Cleanup header for events.
5661570e4e GP2X: Commit some cleanup/fudges with a view to collapsing into the GPH backend.
bb6bc31813 GP2X: Mask off the graphics and events code behind a GP2X_OLD define.
6f1c7cf30a GPH: Change backend to mask backend code to GPH_DEVICE.
38ed8d2fcd CONFIGURE: Move GP2X to build with the GPH backend by default.
Commit: 18e35a638d3eaf1ea9941507e97c1f1eedf0abb0
https://github.com/scummvm/scummvm/commit/18e35a638d3eaf1ea9941507e97c1f1eedf0abb0
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-11T10:00:46-07:00
Commit Message:
OPENPANDORA: Cleanup header for events.
Changed paths:
backends/events/openpandora/op-events.h
diff --git a/backends/events/openpandora/op-events.h b/backends/events/openpandora/op-events.h
index 4b13ef2..9aa6379 100644
--- a/backends/events/openpandora/op-events.h
+++ b/backends/events/openpandora/op-events.h
@@ -37,8 +37,6 @@ protected:
bool _buttonStateL;
bool remapKey(SDL_Event &ev, Common::Event &event);
-
-//private:
bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
};
Commit: 5661570e4efd6ac64cfdbca68515c78329d11a77
https://github.com/scummvm/scummvm/commit/5661570e4efd6ac64cfdbca68515c78329d11a77
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-11T10:00:46-07:00
Commit Message:
GP2X: Commit some cleanup/fudges with a view to collapsing into the GPH backend.
Changed paths:
backends/events/gp2xsdl/gp2xsdl-events.cpp
backends/events/gp2xsdl/gp2xsdl-events.h
backends/platform/gp2x/gp2x-common.h
backends/platform/gp2x/gp2x-main.cpp
backends/platform/gp2x/gp2x.cpp
diff --git a/backends/events/gp2xsdl/gp2xsdl-events.cpp b/backends/events/gp2xsdl/gp2xsdl-events.cpp
index 91feb2b..38b7a47 100644
--- a/backends/events/gp2xsdl/gp2xsdl-events.cpp
+++ b/backends/events/gp2xsdl/gp2xsdl-events.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/scummsys.h"
@@ -28,12 +25,8 @@
#if defined(GP2X)
#include "backends/events/gp2xsdl/gp2xsdl-events.h"
-#if defined(GP2X)
#include "backends/platform/gp2x/gp2x-hw.h"
#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h"
-#else
-#include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
-#endif
#include "backends/platform/sdl/sdl.h"
@@ -88,7 +81,6 @@ enum {
GP2XSdlEventSource::GP2XSdlEventSource()
: _buttonStateL(false){
-
}
void GP2XSdlEventSource::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) {
@@ -468,5 +460,4 @@ bool GP2XSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return false;
}
-
#endif
diff --git a/backends/events/gp2xsdl/gp2xsdl-events.h b/backends/events/gp2xsdl/gp2xsdl-events.h
index 5bf472d..0d74c1b 100644
--- a/backends/events/gp2xsdl/gp2xsdl-events.h
+++ b/backends/events/gp2xsdl/gp2xsdl-events.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#if !defined(BACKEND_EVENTS_SDL_GP2X_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER)
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h
index 4d2a9c3..2a06cab 100644
--- a/backends/platform/gp2x/gp2x-common.h
+++ b/backends/platform/gp2x/gp2x-common.h
@@ -26,7 +26,11 @@
#ifndef PLATFORM_SDL_GP2X_H
#define PLATFORM_SDL_GP2X_H
+#include "backends/base-backend.h"
+#include "backends/platform/sdl/sdl.h"
#include "backends/platform/sdl/posix/posix.h"
+#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h"
+#include "backends/events/gp2xsdl/gp2xsdl-events.h"
#ifndef PATH_MAX
#define PATH_MAX 255
@@ -34,12 +38,15 @@
class OSystem_GP2X : public OSystem_POSIX {
public:
- virtual void initBackend();
- virtual void quit();
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+ OSystem_GP2X() {}
+
+ void initBackend();
+ void quit();
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+ void initSDL();
protected:
- virtual void initSDL();
+
};
#endif
diff --git a/backends/platform/gp2x/gp2x-main.cpp b/backends/platform/gp2x/gp2x-main.cpp
index a194acc..f1ee5ed 100644
--- a/backends/platform/gp2x/gp2x-main.cpp
+++ b/backends/platform/gp2x/gp2x-main.cpp
@@ -18,15 +18,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "backends/platform/gp2x/gp2x-common.h"
-#include "backends/plugins/posix/posix-provider.h"
+#include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h"
+#if defined(GP2X)
int main(int argc, char *argv[]) {
// Create our OSystem instance
@@ -37,7 +35,7 @@ int main(int argc, char *argv[]) {
((OSystem_GP2X *)g_system)->init();
#ifdef DYNAMIC_MODULES
- PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
+ PluginManager::instance().addPluginProvider(new SDLPluginProvider());
#endif
// Invoke the actual ScummVM main entry point:
@@ -48,3 +46,5 @@ int main(int argc, char *argv[]) {
return res;
}
+
+#endif
diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 8ae54d6..4cdb4cd 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
@@ -31,12 +28,11 @@
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include "backends/platform/sdl/sdl-sys.h"
#include "backends/platform/gp2x/gp2x-common.h"
#include "backends/platform/gp2x/gp2x-hw.h"
#include "backends/platform/gp2x/gp2x-mem.h"
-#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h"
-#include "backends/events/gp2xsdl/gp2xsdl-events.h"
#include "backends/saves/default/default-saves.h"
#include "common/config-manager.h"
@@ -143,7 +139,7 @@ void OSystem_GP2X::initBackend() {
if (_graphicsManager == 0)
_graphicsManager = new GP2XSdlGraphicsManager(_eventSource);
- // Call parent implementation of this method
+ /* Pass to POSIX method to do the heavy lifting */
OSystem_POSIX::initBackend();
}
Commit: bb6bc31813e77b5547b365dc401c0b239952d7c3
https://github.com/scummvm/scummvm/commit/bb6bc31813e77b5547b365dc401c0b239952d7c3
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-11T10:15:14-07:00
Commit Message:
GP2X: Mask off the graphics and events code behind a GP2X_OLD define.
* This is a temp thing while I finish up merging the GP2X and GPH code.
I do not want the GP2X backend code dropped yet until this is complete.
Changed paths:
backends/events/gp2xsdl/gp2xsdl-events.cpp
backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
diff --git a/backends/events/gp2xsdl/gp2xsdl-events.cpp b/backends/events/gp2xsdl/gp2xsdl-events.cpp
index 38b7a47..86d4de3 100644
--- a/backends/events/gp2xsdl/gp2xsdl-events.cpp
+++ b/backends/events/gp2xsdl/gp2xsdl-events.cpp
@@ -22,7 +22,7 @@
#include "common/scummsys.h"
-#if defined(GP2X)
+#if defined(GP2X_OLD)
#include "backends/events/gp2xsdl/gp2xsdl-events.h"
#include "backends/platform/gp2x/gp2x-hw.h"
diff --git a/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp b/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
index 75a1f17..6e5a35a 100644
--- a/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
+++ b/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
@@ -18,14 +18,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/scummsys.h"
-#ifdef GP2X
+#if defined(GP2X_OLD)
#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h"
#include "graphics/scaler/aspect.h"
Commit: 6f1c7cf30ac3c36d6ececdadc77ff5cfac3dce66
https://github.com/scummvm/scummvm/commit/6f1c7cf30ac3c36d6ececdadc77ff5cfac3dce66
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-11T10:22:58-07:00
Commit Message:
GPH: Change backend to mask backend code to GPH_DEVICE.
* This is mainly to make it easy to drop the old GP2X into the
same codebase (I really have no desire to manage 2 sets of 99.9%
identical code ;)).
* Code paths for just one of the supported devices can be runtime
worked out or just defined for that device.
mount.sh: Fixed some small errors# ../../../../scummvm.gph
Changed paths:
A backends/platform/gph/gp2x-bundle.mk
R backends/platform/gp2x/gp2x-bundle.mk
backends/events/gph/gph-events.cpp
backends/graphics/gph/gph-graphics.cpp
backends/platform/gph/gph-main.cpp
backends/platform/gph/gph-sdl.h
diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 05fd747..46ab946 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -26,7 +26,7 @@
* GPH: Device Specific Event Handling.
*/
-#if defined(GP2XWIZ) || defined(CAANOO)
+#if defined(GPH_DEVICE)
#include "backends/events/gph/gph-events.h"
#include "backends/graphics/gph/gph-graphics.h"
diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp
index 2f971f8..4f2185e 100644
--- a/backends/graphics/gph/gph-graphics.cpp
+++ b/backends/graphics/gph/gph-graphics.cpp
@@ -22,7 +22,7 @@
#include "common/scummsys.h"
-#if defined(GP2XWIZ) || defined(CAANOO)
+#if defined(GPH_DEVICE)
#include "backends/graphics/gph/gph-graphics.h"
#include "backends/events/gph/gph-events.h"
diff --git a/backends/platform/gp2x/gp2x-bundle.mk b/backends/platform/gp2x/gp2x-bundle.mk
deleted file mode 100755
index 67d22d1..0000000
--- a/backends/platform/gp2x/gp2x-bundle.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Special target to create bundles for the GP2X.
-
-bundle_name = release/scummvm-gp2x
-
-gp2x-bundle: $(EXECUTABLE)
- $(MKDIR) "$(bundle_name)"
- $(MKDIR) "$(bundle_name)/saves"
- $(MKDIR) "$(bundle_name)/engine-data"
-
- echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
-
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
-
- $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
- $(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
- $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
-
- $(STRIP) $(EXECUTABLE) -o $(bundle_name)/$(EXECUTABLE)
-
-ifdef DYNAMIC_MODULES
- $(INSTALL) -d "$(bundle_name)/plugins"
- $(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/plugins"
- $(STRIP) $(bundle_name)/plugins/*
-endif
-
- tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
- rm -R ./$(bundle_name)
-
-gp2x-bundle-debug: $(EXECUTABLE)
- $(MKDIR) "$(bundle_name)"
- $(MKDIR) "$(bundle_name)/saves"
- $(MKDIR) "$(bundle_name)/engine-data"
-
- echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
-
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
-
- $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
- $(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
- $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
-
- $(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/$(EXECUTABLE)
-
-ifdef DYNAMIC_MODULES
- $(INSTALL) -d "$(bundle_name)/scummvm/plugins"
- $(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
-endif
-
- tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
- rm -R ./$(bundle_name)
-
-.PHONY: gp2x-bundle gp2x-bundle-debug
diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
new file mode 100644
index 0000000..67d22d1
--- /dev/null
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -0,0 +1,60 @@
+# Special target to create bundles for the GP2X.
+
+bundle_name = release/scummvm-gp2x
+
+gp2x-bundle: $(EXECUTABLE)
+ $(MKDIR) "$(bundle_name)"
+ $(MKDIR) "$(bundle_name)/saves"
+ $(MKDIR) "$(bundle_name)/engine-data"
+
+ echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
+
+ $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
+
+ $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
+ $(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
+ $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
+
+ $(STRIP) $(EXECUTABLE) -o $(bundle_name)/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+ $(INSTALL) -d "$(bundle_name)/plugins"
+ $(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/plugins"
+ $(STRIP) $(bundle_name)/plugins/*
+endif
+
+ tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
+ rm -R ./$(bundle_name)
+
+gp2x-bundle-debug: $(EXECUTABLE)
+ $(MKDIR) "$(bundle_name)"
+ $(MKDIR) "$(bundle_name)/saves"
+ $(MKDIR) "$(bundle_name)/engine-data"
+
+ echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
+
+ $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
+
+ $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
+ $(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
+ $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
+
+ $(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+ $(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+ $(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+endif
+
+ tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
+ rm -R ./$(bundle_name)
+
+.PHONY: gp2x-bundle gp2x-bundle-debug
diff --git a/backends/platform/gph/gph-main.cpp b/backends/platform/gph/gph-main.cpp
index c7d691f..f91ec8f 100644
--- a/backends/platform/gph/gph-main.cpp
+++ b/backends/platform/gph/gph-main.cpp
@@ -24,7 +24,7 @@
#include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h"
-#if defined(GP2XWIZ) || defined(CAANOO)
+#if defined(GPH_DEVICE)
int main(int argc, char *argv[]) {
diff --git a/backends/platform/gph/gph-sdl.h b/backends/platform/gph/gph-sdl.h
index ef696bc..51c609d2 100644
--- a/backends/platform/gph/gph-sdl.h
+++ b/backends/platform/gph/gph-sdl.h
@@ -23,7 +23,7 @@
#ifndef GPH_H
#define GPH_H
-#if defined(GP2XWIZ) || defined(CAANOO)
+#if defined(GPH_DEVICE)
#include "backends/base-backend.h"
#include "backends/platform/sdl/sdl.h"
Commit: 38ed8d2fcda04e8fb84b73416320fbf2344b5fd3
https://github.com/scummvm/scummvm/commit/38ed8d2fcda04e8fb84b73416320fbf2344b5fd3
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-11T10:24:36-07:00
Commit Message:
CONFIGURE: Move GP2X to build with the GPH backend by default.
Changed paths:
configure
diff --git a/configure b/configure
index 75a64e0..63669bb 100755
--- a/configure
+++ b/configure
@@ -1823,12 +1823,12 @@ if test -n "$_host"; then
add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
- _backend="gp2x"
+ _backend="gph"
_build_hq_scalers=no
_mt32emu=no
_vkeybd=yes
_seq_midi=no
- _port_mk="backends/platform/gp2x/gp2x-bundle.mk"
+ _port_mk="backends/platform/gph/gp2x-bundle.mk"
;;
gp2xwiz)
# This uses the GPH backend.
More information about the Scummvm-git-logs
mailing list