aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorDavid-John Willis2011-04-11 18:22:58 +0100
committerDavid-John Willis2011-04-11 18:22:58 +0100
commit6f1c7cf30ac3c36d6ececdadc77ff5cfac3dce66 (patch)
treeb9e2eb02ba30f9bb0eda77dc7618eb0c88049d29 /backends
parentbb6bc31813e77b5547b365dc401c0b239952d7c3 (diff)
downloadscummvm-rg350-6f1c7cf30ac3c36d6ececdadc77ff5cfac3dce66.tar.gz
scummvm-rg350-6f1c7cf30ac3c36d6ececdadc77ff5cfac3dce66.tar.bz2
scummvm-rg350-6f1c7cf30ac3c36d6ececdadc77ff5cfac3dce66.zip
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
Diffstat (limited to 'backends')
-rw-r--r--backends/events/gph/gph-events.cpp2
-rw-r--r--backends/graphics/gph/gph-graphics.cpp2
-rw-r--r--[-rwxr-xr-x]backends/platform/gph/gp2x-bundle.mk (renamed from backends/platform/gp2x/gp2x-bundle.mk)0
-rw-r--r--backends/platform/gph/gph-main.cpp2
-rw-r--r--backends/platform/gph/gph-sdl.h2
5 files changed, 4 insertions, 4 deletions
diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 05fd747605..46ab94609c 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 2f971f8da1..4f2185ef4b 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/gph/gp2x-bundle.mk
index 67d22d1889..67d22d1889 100755..100644
--- a/backends/platform/gp2x/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
diff --git a/backends/platform/gph/gph-main.cpp b/backends/platform/gph/gph-main.cpp
index c7d691fc66..f91ec8f478 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 ef696bc3d8..51c609d29e 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"