[Scummvm-git-logs] scummvm master -> 197ba8cbd5e43b20f4418ed87b00566033293f04

[ccawley2011]

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:
197ba8cbd5 BACKENDS: Remove leftover GP2X references


Commit: 197ba8cbd5e43b20f4418ed87b00566033293f04
    https://github.com/scummvm/scummvm/commit/197ba8cbd5e43b20f4418ed87b00566033293f04
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-09-29T22:48:29+01:00

Commit Message:
BACKENDS: Remove leftover GP2X references

Changed paths:
    audio/softsynth/opl/mame.cpp
    backends/mixer/sdl/sdl-mixer.cpp
    backends/module.mk
    configure
    devtools/update-version.pl


diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index 12111981a40..dd7d1142738 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -39,7 +39,7 @@
 #include "common/textconsole.h"
 #include "common/util.h"
 
-#if defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__)
+#if defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__)
 #include "common/config-manager.h"
 #endif
 
@@ -1234,7 +1234,7 @@ FM_OPL *makeAdLibOPL(int rate) {
 	// We need to emulate one YM3812 chip
 	int env_bits = FMOPL_ENV_BITS_HQ;
 	int eg_ent = FMOPL_EG_ENT_HQ;
-#if defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__)
+#if defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__)
 	if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) {
 		env_bits = FMOPL_ENV_BITS_HQ;
 		eg_ent = FMOPL_EG_ENT_HQ;
diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index e902785a20d..022d50e0598 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -29,9 +29,7 @@
 #include "common/config-manager.h"
 #include "common/textconsole.h"
 
-#if defined(GP2X)
-#define SAMPLES_PER_SEC 11025
-#elif defined(PLAYSTATION3) || defined(PSP2) || defined(NINTENDO_SWITCH)
+#if defined(PLAYSTATION3) || defined(PSP2) || defined(NINTENDO_SWITCH)
 #define SAMPLES_PER_SEC 48000
 #elif defined(__MINT__)
 #define SAMPLES_PER_SEC 49170
diff --git a/backends/module.mk b/backends/module.mk
index 7314e4d4c26..1ca42fb0488 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -393,12 +393,6 @@ MODULE_OBJS += \
 	events/dinguxsdl/dinguxsdl-events.o
 endif
 
-ifeq ($(BACKEND),gph)
-MODULE_OBJS += \
-	events/gph/gph-events.o \
-	graphics/gph/gph-graphics.o
-endif
-
 ifdef IPHONE
 MODULE_OBJS += \
 	mutex/pthread/pthread-mutex.o \
diff --git a/configure b/configure
index ab53209f3b7..5ddad35108a 100755
--- a/configure
+++ b/configure
@@ -1887,7 +1887,7 @@ else
 fi
 
 case $_host in
-arm-*riscos | ds | gp2x | gp2xwiz | openpandora | psp | psp2 | switch)
+arm-*riscos | ds | openpandora | psp | psp2 | switch)
 	if test "$_debug_build" = auto; then
 		# If you want to debug one of these platforms, use '--disable-optimizations --enable-debug'
 		_debug_build=no
diff --git a/devtools/update-version.pl b/devtools/update-version.pl
index ad4cef9c066..58d440754c0 100755
--- a/devtools/update-version.pl
+++ b/devtools/update-version.pl
@@ -45,8 +45,6 @@ my @subs_files = qw(
 	dists/openpandora/README-OPENPANDORA
 	dists/openpandora/README-PND.txt
 	dists/openpandora/index.html
-	dists/gph/README-GPH
-	dists/gph/scummvm.ini
 	dists/riscos/!Boot,feb
 	dists/amigaos/md2ag.rexx
 	backends/platform/psp/README.PSP