GP2XWIZ: Rename GP2XWIZ backend to GPH.

* This better reflects the supported devices
  from GPH (GamePark Holdings), namely the 
  GP2XWiz, Caanoo and merging in of the old 
  GP2X backend.

svn-id: r52648

29 files changed, 37 insertions, 46 deletions

diff --git a/backends/platform/gp2xwiz/build/README-GP2XWIZ b/backends/platform/gph/build/README-GP2XWIZ
index ec8142a6f3..ec8142a6f3 100644
--- a/backends/platform/gp2xwiz/build/README-GP2XWIZ
+++ b/backends/platform/gph/build/README-GP2XWIZ
diff --git a/backends/platform/gp2xwiz/build/build.sh b/backends/platform/gph/build/build.sh
index 876c3e378a..876c3e378a 100755
--- a/backends/platform/gp2xwiz/build/build.sh
+++ b/backends/platform/gph/build/build.sh
diff --git a/backends/platform/gp2xwiz/build/bundle-debug.sh b/backends/platform/gph/build/bundle-debug.sh
index cd5145b31d..cd5145b31d 100755
--- a/backends/platform/gp2xwiz/build/bundle-debug.sh
+++ b/backends/platform/gph/build/bundle-debug.sh
diff --git a/backends/platform/gp2xwiz/build/bundle.sh b/backends/platform/gph/build/bundle.sh
index 579e2dc77b..579e2dc77b 100755
--- a/backends/platform/gp2xwiz/build/bundle.sh
+++ b/backends/platform/gph/build/bundle.sh
diff --git a/backends/platform/gp2xwiz/build/clean.sh b/backends/platform/gph/build/clean.sh
index 5ec1b9e62c..5ec1b9e62c 100755
--- a/backends/platform/gp2xwiz/build/clean.sh
+++ b/backends/platform/gph/build/clean.sh
diff --git a/backends/platform/gp2xwiz/build/config-alleng.sh b/backends/platform/gph/build/config-alleng.sh
index cfed463edf..cfed463edf 100755
--- a/backends/platform/gp2xwiz/build/config-alleng.sh
+++ b/backends/platform/gph/build/config-alleng.sh
diff --git a/backends/platform/gp2xwiz/build/config.sh b/backends/platform/gph/build/config.sh
index 54c4795298..54c4795298 100755
--- a/backends/platform/gp2xwiz/build/config.sh
+++ b/backends/platform/gph/build/config.sh
diff --git a/backends/platform/gp2xwiz/build/scummvm-gdb.gpe b/backends/platform/gph/build/scummvm-gdb.gpe
index 64b6c8b974..64b6c8b974 100755
--- a/backends/platform/gp2xwiz/build/scummvm-gdb.gpe
+++ b/backends/platform/gph/build/scummvm-gdb.gpe
diff --git a/backends/platform/gp2xwiz/build/scummvm.gpe b/backends/platform/gph/build/scummvm.gpe
index 42cc00a22a..42cc00a22a 100755
--- a/backends/platform/gp2xwiz/build/scummvm.gpe
+++ b/backends/platform/gph/build/scummvm.gpe
diff --git a/backends/platform/gp2xwiz/build/scummvm.ini b/backends/platform/gph/build/scummvm.ini
index c9cce92379..c9cce92379 100644
--- a/backends/platform/gp2xwiz/build/scummvm.ini
+++ b/backends/platform/gph/build/scummvm.ini
diff --git a/backends/platform/gp2xwiz/build/scummvm.png b/backends/platform/gph/build/scummvm.png
index 128e59efc4..128e59efc4 100644
--- a/backends/platform/gp2xwiz/build/scummvm.png
+++ b/backends/platform/gph/build/scummvm.png
diff --git a/backends/platform/gp2xwiz/build/scummvmb.png b/backends/platform/gph/build/scummvmb.png
index 24a27bc0e1..24a27bc0e1 100644
--- a/backends/platform/gp2xwiz/build/scummvmb.png
+++ b/backends/platform/gph/build/scummvmb.png
diff --git a/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
index d02ed5fe16..84b99c5c53 100755
--- a/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -14,11 +14,11 @@ caanoo-bundle: $(EXECUTABLE)
 	
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/caanoo/scummvm.gpe $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+	$(CP) $(srcdir)/backends/platform/gph/caanoo/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/	
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -45,11 +45,11 @@ caanoo-bundle-debug: $(EXECUTABLE)
 	
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+	$(CP) $(srcdir)/backends/platform/gph/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/	
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
diff --git a/backends/platform/gp2xwiz/caanoo/build.sh b/backends/platform/gph/caanoo/build.sh
index 8000d2595d..8000d2595d 100755
--- a/backends/platform/gp2xwiz/caanoo/build.sh
+++ b/backends/platform/gph/caanoo/build.sh
diff --git a/backends/platform/gp2xwiz/caanoo/bundle-debug.sh b/backends/platform/gph/caanoo/bundle-debug.sh
index 2d5cefe80e..2d5cefe80e 100755
--- a/backends/platform/gp2xwiz/caanoo/bundle-debug.sh
+++ b/backends/platform/gph/caanoo/bundle-debug.sh
diff --git a/backends/platform/gp2xwiz/caanoo/bundle.sh b/backends/platform/gph/caanoo/bundle.sh
index 76fd31cec6..76fd31cec6 100755
--- a/backends/platform/gp2xwiz/caanoo/bundle.sh
+++ b/backends/platform/gph/caanoo/bundle.sh
diff --git a/backends/platform/gp2xwiz/caanoo/clean.sh b/backends/platform/gph/caanoo/clean.sh
index 5ec1b9e62c..5ec1b9e62c 100755
--- a/backends/platform/gp2xwiz/caanoo/clean.sh
+++ b/backends/platform/gph/caanoo/clean.sh
diff --git a/backends/platform/gp2xwiz/caanoo/config-alleng.sh b/backends/platform/gph/caanoo/config-alleng.sh
index 7a097c268b..7a097c268b 100755
--- a/backends/platform/gp2xwiz/caanoo/config-alleng.sh
+++ b/backends/platform/gph/caanoo/config-alleng.sh
diff --git a/backends/platform/gp2xwiz/caanoo/config.sh b/backends/platform/gph/caanoo/config.sh
index 73ce5da624..73ce5da624 100755
--- a/backends/platform/gp2xwiz/caanoo/config.sh
+++ b/backends/platform/gph/caanoo/config.sh
diff --git a/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe b/backends/platform/gph/caanoo/scummvm-gdb.gpe
index a8f2aae0fe..a8f2aae0fe 100755
--- a/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe
+++ b/backends/platform/gph/caanoo/scummvm-gdb.gpe
diff --git a/backends/platform/gp2xwiz/caanoo/scummvm.gpe b/backends/platform/gph/caanoo/scummvm.gpe
index 8341ffc3d7..8341ffc3d7 100755
--- a/backends/platform/gp2xwiz/caanoo/scummvm.gpe
+++ b/backends/platform/gph/caanoo/scummvm.gpe
diff --git a/backends/platform/gp2xwiz/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index c572b86939..21fd0c74de 100755
--- a/backends/platform/gp2xwiz/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -14,11 +14,11 @@ gp2xwiz-bundle: $(EXECUTABLE)
 	
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.gpe $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/	
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -48,11 +48,11 @@ gp2xwiz-bundle-debug: $(EXECUTABLE)
 	
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/	
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
diff --git a/backends/platform/gp2xwiz/gp2xwiz-events.cpp b/backends/platform/gph/gph-events.cpp
index b226dbddb0..91ea30bdc9 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-events.cpp
+++ b/backends/platform/gph/gph-events.cpp
@@ -28,8 +28,8 @@
  *
  */
 
-#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"
-#include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
+#include "backends/platform/gph/gph-sdl.h"
+#include "backends/platform/gph/gph-hw.h"
 #include "graphics/scaler/aspect.h"
 
 #include "common/util.h"
diff --git a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp b/backends/platform/gph/gph-graphics.cpp
index 92329d7c40..8fada7e40a 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
+++ b/backends/platform/gph/gph-graphics.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"
+#include "backends/platform/gph/gph-sdl.h"
 
 #include "common/mutex.h"
 #include "graphics/font.h"
diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp b/backends/platform/gph/gph-hw.cpp
index f7cc716df0..b43324b547 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
+++ b/backends/platform/gph/gph-hw.cpp
@@ -28,7 +28,7 @@
  *
  */
 
-#include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
+#include "backends/platform/gph/gph-hw.h"
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.h b/backends/platform/gph/gph-hw.h
index 2fc7a85f5c..7276276608 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-hw.h
+++ b/backends/platform/gph/gph-hw.h
@@ -28,16 +28,8 @@
  *
  */
 
-#ifndef GP2XWIZ_HW_H
-#define GP2XWIZ_HW_H
-
-#if defined (CAANOO)
-	/* Vibrate features that GPH put in the */
-	/* SDL port but did not define */
-	extern void SDL_VibrateInit();
-	extern void SDL_VibrateQuit();
-	extern void SDL_VibratePlay(int);
-#endif
+#ifndef GPH_HW_H
+#define GPH_HW_H
 
 namespace WIZ_HW {
 
@@ -54,8 +46,7 @@ namespace GPH {
 extern int tapmodeLevel;
 
 extern void	ToggleTapMode();
-extern int GetTapMode();
 
 } /* namespace GPH */
 
-#endif //GP2XWIZ_HW_H
+#endif //GPH_HW_H
diff --git a/backends/platform/gp2xwiz/gp2xwiz-main.cpp b/backends/platform/gph/gph-main.cpp
index a40b49ae18..adc79b186c 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-main.cpp
+++ b/backends/platform/gph/gph-main.cpp
@@ -26,8 +26,8 @@
 #include "common/scummsys.h"
 #include <SDL/SDL.h>
 
-#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"
-#include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
+#include "backends/platform/gph/gph-sdl.h"
+#include "backends/platform/gph/gph-hw.h"
 #include "backends/plugins/posix/posix-provider.h"
 #include "base/main.h"
 
diff --git a/backends/platform/gp2xwiz/gp2xwiz-sdl.h b/backends/platform/gph/gph-sdl.h
index bae9a87771..136363f9a0 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-sdl.h
+++ b/backends/platform/gph/gph-sdl.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GP2XWIZ_SDL_H
-#define GP2XWIZ_SDL_H
+#ifndef GPH_SDL_H
+#define GPH_SDL_H
 
 #include "backends/platform/sdl/sdl.h"
 
@@ -78,4 +78,4 @@ protected:
 	bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
 };
 
-#endif
+#endif //GPH_SDL_H
diff --git a/backends/platform/gp2xwiz/module.mk b/backends/platform/gph/module.mk
index edf2f2a717..f5567f581e 100644
--- a/backends/platform/gp2xwiz/module.mk
+++ b/backends/platform/gph/module.mk
@@ -1,10 +1,10 @@
-MODULE := backends/platform/gp2xwiz
+MODULE := backends/platform/gph
 
 MODULE_OBJS := \
-	gp2xwiz-events.o \
-	gp2xwiz-graphics.o \
-	gp2xwiz-hw.o \
-	gp2xwiz-main.o
+	gph-events.o \
+	gph-graphics.o \
+	gph-hw.o \
+	gph-main.o
 
 # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))