[Scummvm-git-logs] scummvm master -> c4d1359f45847944c99691cf40b64ce1a0d0e8ab
sev-
noreply at scummvm.org
Sun Sep 29 22:24:27 UTC 2024
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:
c4d1359f45 BACKENDS: Remove the legacy Dingux backend
Commit: c4d1359f45847944c99691cf40b64ce1a0d0e8ab
https://github.com/scummvm/scummvm/commit/c4d1359f45847944c99691cf40b64ce1a0d0e8ab
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-09-30T00:24:25+02:00
Commit Message:
BACKENDS: Remove the legacy Dingux backend
# Conflicts:
# backends/module.mk
Changed paths:
R backends/events/dinguxsdl/dinguxsdl-events.cpp
R backends/events/dinguxsdl/dinguxsdl-events.h
R backends/events/sdl/legacy-sdl-events.cpp
R backends/events/sdl/legacy-sdl-events.h
R backends/platform/dingux/README.DINGUX
R backends/platform/dingux/README.GCW0
R backends/platform/dingux/build.gcw0.sh
R backends/platform/dingux/dingux.cpp
R backends/platform/dingux/dingux.h
R backends/platform/dingux/dingux.mk
R backends/platform/dingux/main.cpp
R backends/platform/dingux/module.mk
R backends/platform/dingux/scummvm.gpe
R backends/platform/dingux/scummvm.png
R dists/gcw0/default.gcw0.desktop
R dists/gcw0/opk_make.sh
R dists/gcw0/scummvm.png
R dists/gcw0/scummvm.sh
R dists/gcw0/scummvmrc
backends/events/samsungtvsdl/samsungtvsdl-events.h
backends/module.mk
backends/platform/sdl/posix/posix-main.cpp
backends/platform/sdl/sdl.cpp
configure
diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp
deleted file mode 100644
index 3bf9a0710f9..00000000000
--- a/backends/events/dinguxsdl/dinguxsdl-events.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "common/scummsys.h"
-
-#if defined(DINGUX)
-
-#include "backends/events/dinguxsdl/dinguxsdl-events.h"
-
-#ifndef GCW0
-#define PAD_UP SDLK_UP
-#define PAD_DOWN SDLK_DOWN
-#define PAD_LEFT SDLK_LEFT
-#define PAD_RIGHT SDLK_RIGHT
-#define BUT_A SDLK_LCTRL
-#define BUT_B SDLK_LALT
-#define BUT_X SDLK_SPACE // BUT_Y in GCW0
-#define BUT_Y SDLK_LSHIFT // BUT_X in GCW0
-#define BUT_SELECT SDLK_ESCAPE
-#define BUT_START SDLK_RETURN
-#define TRIG_L SDLK_TAB
-#define TRIG_R SDLK_BACKSPACE
-#else // GCW0
-
-/******
- * GCW0 keymap
- * Dingoo button
- * A -> Left Button BUT_Y
- * B -> right button BUT_B
- * X -> ' ' BUT_A '0'
- * Y -> '.' BUT_X
- * Select -> ESC TRIG_R
- * Start -> F5 TRIG_L
- * L -> Shift BUT_START
- * R -> VK BUT_SELECT
- */
-
-#define PAD_UP SDLK_UP
-#define PAD_DOWN SDLK_DOWN
-#define PAD_LEFT SDLK_LEFT
-#define PAD_RIGHT SDLK_RIGHT
-#define BUT_A SDLK_LSHIFT
-#define BUT_B SDLK_LALT
-#define BUT_X SDLK_SPACE
-#define BUT_Y SDLK_LCTRL
-#define BUT_SELECT SDLK_BACKSPACE
-#define BUT_START SDLK_TAB
-#define TRIG_L SDLK_RETURN
-#define TRIG_R SDLK_ESCAPE
-
-#endif
-
-bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
- if (ev.key.keysym.sym == PAD_UP) {
- if (ev.type == SDL_KEYDOWN) {
- _km.y_vel = -1 * MULTIPLIER;
- _km.y_down_count = 1;
- } else {
- _km.y_vel = 0 * MULTIPLIER;
- _km.y_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == PAD_DOWN) {
- if (ev.type == SDL_KEYDOWN) {
- _km.y_vel = 1 * MULTIPLIER;
- _km.y_down_count = 1;
- } else {
- _km.y_vel = 0 * MULTIPLIER;
- _km.y_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == PAD_LEFT) {
- if (ev.type == SDL_KEYDOWN) {
- _km.x_vel = -1 * MULTIPLIER;
- _km.x_down_count = 1;
- } else {
- _km.x_vel = 0 * MULTIPLIER;
- _km.x_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == PAD_RIGHT) {
- if (ev.type == SDL_KEYDOWN) {
- _km.x_vel = 1 * MULTIPLIER;
- _km.x_down_count = 1;
- } else {
- _km.x_vel = 0 * MULTIPLIER;
- _km.x_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == BUT_Y) { // left mouse button
- if (ev.type == SDL_KEYDOWN) {
- event.type = Common::EVENT_LBUTTONDOWN;
- } else {
- event.type = Common::EVENT_LBUTTONUP;
- }
-
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == BUT_B) { // right mouse button
- if (ev.type == SDL_KEYDOWN) {
- event.type = Common::EVENT_RBUTTONDOWN;
- } else {
- event.type = Common::EVENT_RBUTTONUP;
- }
-
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == BUT_X) { // '.' skip dialogue
- ev.key.keysym.sym = SDLK_PERIOD;
- ev.key.keysym.mod = KMOD_NONE;
- ev.key.keysym.unicode = '.';
- } else if (ev.key.keysym.sym == TRIG_L) { // global menu
- ev.key.keysym.sym = SDLK_F5;
- event.kbd.keycode = Common::KEYCODE_F5;
- event.kbd.ascii = Common::ASCII_F5;
- event.kbd.flags = Common::KBD_CTRL;
-
- if (ev.type == SDL_KEYDOWN) {
- event.type = Common::EVENT_KEYDOWN;
- } else {
- event.type = Common::EVENT_KEYUP;
- }
-
- return true;
- } else if (ev.key.keysym.sym == BUT_A) { // key '0'
- ev.key.keysym.sym = SDLK_0;
-
- event.kbd.keycode = Common::KEYCODE_0;
- event.kbd.ascii = '0';
- event.kbd.flags = 0;
-
- if (ev.type == SDL_KEYDOWN) {
- event.type = Common::EVENT_KEYDOWN;
- } else {
- event.type = Common::EVENT_KEYUP;
- }
-
- return true;
- } else if (ev.key.keysym.sym == BUT_SELECT) { // virtual keyboard
- if (ev.type == SDL_KEYDOWN)
- event.type = Common::EVENT_VIRTUAL_KEYBOARD;
-
- return true;
- } else if (ev.key.keysym.sym == BUT_START) { // F5, menu in some games
- ev.key.keysym.sym = SDLK_F5;
-
- } else if (ev.key.keysym.sym == TRIG_R) { // ESC
- ev.key.keysym.sym = SDLK_ESCAPE;
- } else {
- event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
- event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
- }
-
- return false;
-}
-
-#endif /* DINGUX */
diff --git a/backends/events/dinguxsdl/dinguxsdl-events.h b/backends/events/dinguxsdl/dinguxsdl-events.h
deleted file mode 100644
index 6e65792c0e5..00000000000
--- a/backends/events/dinguxsdl/dinguxsdl-events.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef BACKENDS_EVENTS_SDL_DINGUX_H
-#define BACKENDS_EVENTS_SDL_DINGUX_H
-
-#include "backends/events/sdl/legacy-sdl-events.h"
-
-class DINGUXSdlEventSource : public LegacySdlEventSource {
-protected:
- bool remapKey(SDL_Event &ev, Common::Event &event);
-};
-
-#endif /* BACKENDS_EVENTS_SDL_DINGUX_H */
diff --git a/backends/events/samsungtvsdl/samsungtvsdl-events.h b/backends/events/samsungtvsdl/samsungtvsdl-events.h
index 59b2427c2e7..b024dcbe727 100644
--- a/backends/events/samsungtvsdl/samsungtvsdl-events.h
+++ b/backends/events/samsungtvsdl/samsungtvsdl-events.h
@@ -22,12 +22,12 @@
#if !defined(BACKEND_EVENTS_SDL_SAMSUNGTV_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER)
#define BACKEND_EVENTS_SDL_SAMSUNGTV_H
-#include "backends/events/sdl/legacy-sdl-events.h"
+#include "backends/events/sdl/sdl-events.h"
/**
* SDL events manager for Samsung TV
*/
-class SamsungTVSdlEventSource : public LegacySdlEventSource {
+class SamsungTVSdlEventSource : public SdlEventSource {
protected:
virtual bool remapKey(SDL_Event &ev, Common::Event &event);
};
diff --git a/backends/events/sdl/legacy-sdl-events.cpp b/backends/events/sdl/legacy-sdl-events.cpp
deleted file mode 100644
index 87cc3cd92e7..00000000000
--- a/backends/events/sdl/legacy-sdl-events.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "common/scummsys.h"
-
-#if defined(SDL_BACKEND)
-
-#include "backends/events/sdl/legacy-sdl-events.h"
-
-// #define JOY_INVERT_Y
-#define JOY_XAXIS 0
-#define JOY_YAXIS 1
-
-LegacySdlEventSource::LegacySdlEventSource() {
- // Reset mouse state
- memset(&_km, 0, sizeof(_km));
-
- ConfMan.registerDefault("kbdmouse_speed", 3);
- ConfMan.registerDefault("joystick_deadzone", 3);
-}
-
-void LegacySdlEventSource::updateKbdMouse() {
- uint32 curTime = g_system->getMillis(true);
- if (curTime < _km.last_time + _km.delay_time) {
- return;
- }
-
- _km.last_time = curTime;
- if (_km.x_down_count == 1) {
- _km.x_down_time = curTime;
- _km.x_down_count = 2;
- }
- if (_km.y_down_count == 1) {
- _km.y_down_time = curTime;
- _km.y_down_count = 2;
- }
-
- if (_km.x_vel || _km.y_vel) {
- if (_km.x_down_count) {
- if (curTime > _km.x_down_time + 300) {
- if (_km.x_vel > 0)
- _km.x_vel += MULTIPLIER;
- else
- _km.x_vel -= MULTIPLIER;
- } else if (curTime > _km.x_down_time + 200) {
- if (_km.x_vel > 0)
- _km.x_vel = 5 * MULTIPLIER;
- else
- _km.x_vel = -5 * MULTIPLIER;
- }
- }
- if (_km.y_down_count) {
- if (curTime > _km.y_down_time + 300) {
- if (_km.y_vel > 0)
- _km.y_vel += MULTIPLIER;
- else
- _km.y_vel -= MULTIPLIER;
- } else if (curTime > _km.y_down_time + 200) {
- if (_km.y_vel > 0)
- _km.y_vel = 5 * MULTIPLIER;
- else
- _km.y_vel = -5 * MULTIPLIER;
- }
- }
-
- int16 speedFactor = computeJoystickMouseSpeedFactor();
-
- // - The modifier key makes the mouse movement slower
- // - The extra factor "delay/speedFactor" ensures velocities
- // are independent of the kbdMouse update rate
- // - all velocities were originally chosen
- // at a delay of 25, so that is the reference used here
- // - note: operator order is important to avoid overflow
- if (_km.modifier) {
- _km.x += ((_km.x_vel / 10) * ((int16)_km.delay_time)) / speedFactor;
- _km.y += ((_km.y_vel / 10) * ((int16)_km.delay_time)) / speedFactor;
- } else {
- _km.x += (_km.x_vel * ((int16)_km.delay_time)) / speedFactor;
- _km.y += (_km.y_vel * ((int16)_km.delay_time)) / speedFactor;
- }
-
- if (_km.x < 0) {
- _km.x = 0;
- _km.x_vel = -1 * MULTIPLIER;
- _km.x_down_count = 1;
- } else if (_km.x > _km.x_max * MULTIPLIER) {
- _km.x = _km.x_max * MULTIPLIER;
- _km.x_vel = 1 * MULTIPLIER;
- _km.x_down_count = 1;
- }
-
- if (_km.y < 0) {
- _km.y = 0;
- _km.y_vel = -1 * MULTIPLIER;
- _km.y_down_count = 1;
- } else if (_km.y > _km.y_max * MULTIPLIER) {
- _km.y = _km.y_max * MULTIPLIER;
- _km.y_vel = 1 * MULTIPLIER;
- _km.y_down_count = 1;
- }
- }
-}
-
-bool LegacySdlEventSource::handleKbdMouse(Common::Event &event) {
- int32 oldKmX = _km.x;
- int32 oldKmY = _km.y;
-
- updateKbdMouse();
-
- if (_km.x != oldKmX || _km.y != oldKmY) {
- if (_graphicsManager) {
- dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->getWindow()->warpMouseInWindow((Uint16)(_km.x / MULTIPLIER), (Uint16)(_km.y / MULTIPLIER));
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- return processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- }
-
- return false;
-}
-
-bool LegacySdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) {
- if (ev.jaxis.axis == JOY_XAXIS) {
- _km.joy_x = ev.jaxis.value;
- return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
- } else if (ev.jaxis.axis == JOY_YAXIS) {
- _km.joy_y = ev.jaxis.value;
- return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
- }
-
- return SdlEventSource::handleJoyAxisMotion(ev, event);
-}
-
-int16 LegacySdlEventSource::computeJoystickMouseSpeedFactor() const {
- int16 speedFactor;
-
- switch (ConfMan.getInt("kbdmouse_speed")) {
- // 0.25 keyboard pointer speed
- case 0:
- speedFactor = 100;
- break;
- // 0.5 speed
- case 1:
- speedFactor = 50;
- break;
- // 0.75 speed
- case 2:
- speedFactor = 33;
- break;
- // 1.0 speed
- case 3:
- speedFactor = 25;
- break;
- // 1.25 speed
- case 4:
- speedFactor = 20;
- break;
- // 1.5 speed
- case 5:
- speedFactor = 17;
- break;
- // 1.75 speed
- case 6:
- speedFactor = 14;
- break;
- // 2.0 speed
- case 7:
- speedFactor = 12;
- break;
- default:
- speedFactor = 25;
- }
-
- // Scale the mouse cursor speed with the display size so moving across
- // the screen takes a reasonable amount of time at higher resolutions.
- return speedFactor * 480 / _km.y_max;
-}
-
-bool LegacySdlEventSource::handleAxisToMouseMotion(int16 xAxis, int16 yAxis) {
-#ifdef JOY_INVERT_Y
- yAxis = -yAxis;
-#endif
-
- // conversion factor between keyboard mouse and joy axis value
- int vel_to_axis = (1500 / MULTIPLIER);
-
- // radial and scaled deadzone
-
- float analogX = (float)xAxis;
- float analogY = (float)yAxis;
- float deadZone = (float)ConfMan.getInt("joystick_deadzone") * 1000.0f;
-
- float magnitude = sqrt(analogX * analogX + analogY * analogY);
-
- if (magnitude >= deadZone) {
- _km.x_down_count = 0;
- _km.y_down_count = 0;
- float scalingFactor = 1.0f / magnitude * (magnitude - deadZone) / (32769.0f - deadZone);
- _km.x_vel = (int16)(analogX * scalingFactor * 32768.0f / vel_to_axis);
- _km.y_vel = (int16)(analogY * scalingFactor * 32768.0f / vel_to_axis);
- } else {
- _km.x_vel = 0;
- _km.y_vel = 0;
- }
-
- return false;
-}
-
-void LegacySdlEventSource::resetKeyboardEmulation(int16 x_max, int16 y_max) {
- _km.x_max = x_max;
- _km.y_max = y_max;
- _km.delay_time = 12;
- _km.last_time = 0;
- _km.modifier = false;
- _km.joy_x = 0;
- _km.joy_y = 0;
-}
-
-void LegacySdlEventSource::checkScreenChange() {
- if (!_graphicsManager) {
- return;
- }
-
- int newMaxX = dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->getWindowWidth() - 1;
- int newMaxY = dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->getWindowHeight() - 1;
-
- if (_km.x_max != newMaxX || _km.y_max != newMaxY) {
- resetKeyboardEmulation(newMaxX, newMaxY);
- }
-}
-
-bool LegacySdlEventSource::pollEvent(Common::Event &event) {
- checkScreenChange();
-
- bool handled = SdlEventSource::pollEvent(event);
- if (handled) {
- return true;
- }
-
- // Handle mouse control via analog joystick and keyboard
- if (handleKbdMouse(event)) {
- return true;
- }
-
- return false;
-}
-
-bool LegacySdlEventSource::handleMouseMotion(SDL_Event &ev, Common::Event &event) {
- // update KbdMouse
- _km.x = ev.motion.x * MULTIPLIER;
- _km.y = ev.motion.y * MULTIPLIER;
-
- return SdlEventSource::handleMouseMotion(ev, event);
-}
-
-bool LegacySdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
- // update KbdMouse
- _km.x = ev.motion.x * MULTIPLIER;
- _km.y = ev.motion.y * MULTIPLIER;
-
- return SdlEventSource::handleMouseButtonDown(ev, event);
-}
-
-bool LegacySdlEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
- // update KbdMouse
- _km.x = ev.motion.x * MULTIPLIER;
- _km.y = ev.motion.y * MULTIPLIER;
-
- return SdlEventSource::handleMouseButtonUp(ev, event);
-}
-
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-bool LegacySdlEventSource::handleControllerButton(const SDL_Event &ev, Common::Event &event, bool buttonUp) {
- if (event.joystick.button == Common::JOYSTICK_BUTTON_RIGHT_SHOULDER) {
- // Right shoulder is the modifier button that makes the mouse go slower.
- _km.modifier = !buttonUp;
- }
-
- return SdlEventSource::handleControllerButton(ev, event, buttonUp);
-}
-
-bool LegacySdlEventSource::handleControllerAxisMotion(const SDL_Event &ev, Common::Event &event) {
- if (ev.caxis.axis == SDL_CONTROLLER_AXIS_LEFTX) {
- _km.joy_x = ev.caxis.value;
- return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
- } else if (ev.caxis.axis == SDL_CONTROLLER_AXIS_LEFTY) {
- _km.joy_y = ev.caxis.value;
- return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
- }
-
- return SdlEventSource::handleControllerAxisMotion(ev, event);
-}
-#endif
-
-#endif
diff --git a/backends/events/sdl/legacy-sdl-events.h b/backends/events/sdl/legacy-sdl-events.h
deleted file mode 100644
index 919642d0067..00000000000
--- a/backends/events/sdl/legacy-sdl-events.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef BACKEND_EVENTS_SDL_LEGACY_H
-#define BACKEND_EVENTS_SDL_LEGACY_H
-
-#include "backends/events/sdl/sdl-events.h"
-
-// multiplier used to increase resolution for keyboard/joystick mouse
-#define MULTIPLIER 16
-
-class LegacySdlEventSource : public SdlEventSource {
-public:
- LegacySdlEventSource();
-
- bool pollEvent(Common::Event &event) override;
-
- void checkScreenChange();
-
-protected:
- /** @name Keyboard mouse emulation
- * Disabled by fingolfin 2004-12-18.
- * I am keeping the rest of the code in for now, since the joystick
- * code (or rather, "hack") uses it, too.
- */
- //@{
-
- struct KbdMouse {
- int32 x, y;
- int16 x_vel, y_vel, x_max, y_max, x_down_count, y_down_count, joy_x, joy_y;
- uint32 last_time, delay_time, x_down_time, y_down_time;
- bool modifier;
- };
- KbdMouse _km;
-
- virtual void updateKbdMouse();
- virtual bool handleKbdMouse(Common::Event &event);
-
- //@}
-
- bool handleMouseMotion(SDL_Event &ev, Common::Event &event) override;
- bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event) override;
- bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event) override;
- bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) override;
-
-#if SDL_VERSION_ATLEAST(2, 0, 0)
- bool handleControllerButton(const SDL_Event &ev, Common::Event &event, bool buttonUp) override;
- bool handleControllerAxisMotion(const SDL_Event &ev, Common::Event &event) override;
-#endif
-
- /**
- * Update the virtual mouse according to a joystick or game controller axis position change
- */
- virtual bool handleAxisToMouseMotion(int16 xAxis, int16 yAxis);
-
- /**
- * Compute the virtual mouse movement speed factor according to the 'kbdmouse_speed' setting.
- * The speed factor is scaled with the display size.
- */
- int16 computeJoystickMouseSpeedFactor() const;
-
- /**
- * Resets keyboard emulation after a video screen change
- */
- void resetKeyboardEmulation(int16 x_max, int16 y_max);
-
-};
-
-#endif
diff --git a/backends/module.mk b/backends/module.mk
index 1ca42fb0488..6ebd426e024 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -185,7 +185,6 @@ endif
# derive from the SDL backend, and they all need the following files.
ifdef SDL_BACKEND
MODULE_OBJS += \
- events/sdl/legacy-sdl-events.o \
events/sdl/sdl-events.o \
graphics/sdl/sdl-graphics.o \
graphics/surfacesdl/surfacesdl-graphics.o \
@@ -388,11 +387,6 @@ MODULE_OBJS += \
plugins/ds/ds-provider.o
endif
-ifeq ($(BACKEND),dingux)
-MODULE_OBJS += \
- events/dinguxsdl/dinguxsdl-events.o
-endif
-
ifdef IPHONE
MODULE_OBJS += \
mutex/pthread/pthread-mutex.o \
diff --git a/backends/platform/dingux/README.DINGUX b/backends/platform/dingux/README.DINGUX
deleted file mode 100644
index 9e65d4c36db..00000000000
--- a/backends/platform/dingux/README.DINGUX
+++ /dev/null
@@ -1,84 +0,0 @@
-ScummVM-DINGUX README
-==============================================================================
-
-Requirements
-============
-- Dingoo A320/A330
-- Dingux installed on SD card
-- Fixed Tremor libs in dingux rootfs (see below)
-
-Controls
-============
-- Dpad: move mouse cursor
-- Y: left mouse button click
-- A: '0' key
-- B: right mouse button click
-- X: '.' key (skips dialogue line in some engines)
-- Left Trigger: open global menu
-- Right Trigger: ESC button, scene skip in some engines
-- Select: opens virtual keyboard
-- Start: F5 key, game menu in some engines
-
-Installation from binaries
-==============================
-Mount your dingux SD card in your pc, then copy the directory "scummvm" found in
-the release package to a directory inside /pathtosdcard/local/dirofyourchoice
-(on windows it would be SDLETTER:\local\dirofyourchoice).
-At this point is sufficient to point your launcher (eg. gmenu2x) to scummvm.gpe
-file included into the scummvm directory you copied to the SD card, and then launch it.
-
-Building from binaries
-==============================
-It's pretty simple if you are running Linux on an x86/amd64 machine:
-1. Download and install the OpenDingux toolchain (http://www.treewalker.org/opendingux/)
-2. Download ScummVM sources and uncompress them
-3. Create a build directory and run configure specifying the correct library path. Eg.
- mkdir build_dingux
- LDFLAGS="-L/path-to-toolchain/usr/lib" ../path-to-scummvm-sources/configure --host=dingux --enable-plugins --default-dynamic
- make
-4. Prepare the distribution directory
- make dingux-dist
-5. Copy the distribution directory located in dingux-dist/scummvm to your SD card
-6. Enjoy
-
-Kernel and rootfs WARNINGS
-==============================
-
-*** A WARNING about the WARNING! ***
-The info below should no longer be valid relating to the new OpenDingux (http://www.treewalker.org/opendingux/)
-toolchain. When using OpenDingux you don't need custom kernels or libraries,
-after some checking I will remove the following warnings and keep OpenDingux
-as the only supported toolchain.
-
-All the dingux root images (rootfs) i found floating on the net have
-broken tremor libraries, which make scummvm crash in a bad way.
-One solution is to replace the libraries in your rootfs by injecting these fixed ones:
-http://hkzlab.ipv7.net/files/misc/dingux/dingux_fixed_tremor_libs.zip
-After having added these libs, scummvm should work on your standard dingux kernel,
-but this doesn't mean it will work perfectly:
-non-opendingux kernels doesn't have lcd double buffering leading to a lot of annoying
-tearing on screen.
-
-The best way to address all the problems in one shot, is to use an opendingux kernel for
-your dingoo, which has some interesting advantages:
-- The kernel gets updated and kept in sync with main linux tree
-- Double buffering and centering of screen image
-- Support for swap on compressed ram
-I have prepared a rootfs image with fixed libs and swap-on-zram to use together with opendingux kernels:
-http://hkzlab.ipv7.net/files/misc/dingux/opendingux/opendingux_kernel_rootfs.zip
-The kernel and rootfs images in the zip file is what i use for developing scummvm on dingux.
-
-BTW, i have built images for the A330 and A320 with ILI9325 controllers too,
-but these version aren't tested (i have an A320 with ILI9331, but if someone wants to
-donate an A330 to a poor scummvm developer so i can try the port there too... :P)
-
-If you need a launcher with opendingux cpu frequency scaler support, you can find gmenu2x here:
-http://www.treewalker.org/dingux/cpufreq.html
-
-I've also prepared a rootfs image for use on normal dingux kernels (non-opendingux ones).
-It's based on elta's rootfs image with just the fixed libs replaced.
-http://hkzlab.ipv7.net/files/misc/dingux/normal_dingux/rootfs_elta_fixtremor.zip
-I still raccomand the use of opendingux kernel + rootfs, but if you don't, this roofs
-image plus another kernel (eg. SiENcE's one) should be do the job.
-
-Enjoy
diff --git a/backends/platform/dingux/README.GCW0 b/backends/platform/dingux/README.GCW0
deleted file mode 100644
index d51a062cd84..00000000000
--- a/backends/platform/dingux/README.GCW0
+++ /dev/null
@@ -1,40 +0,0 @@
-[ScummVM-GCW0 README]
-
-Controls
-========
-- Dpad/analog joy: move mouse cursor
-- A: left mouse button click
-- B: right mouse button click
-- X: '0' key
-- Y: '.' key (skips dialogue line in some engines)
-- Left Trigger: open global menu
-- Right Trigger: opens virtual keyboard
-- Select: ESC button, scene skip in some engines
-- Start: F5 key, game menu in some engines
-
-Installation from binaries
-==========================
-Copy over scummvm.opk file to /media/data/apps directory on the device.
-
-Building from binaries
-======================
-It's pretty simple if you are running Linux on an x86/amd64 machine:
-1. Download and install the GCW0 toolchain (http://www.gcw-zero.com/develop)
-2. Download ScummVM sources and uncompress them
-3. Run backends/platform/dingux/build.gcw0.sh script
-4. Copy the resulting file scummvm.opk to your device
-5. Enjoy
-
-Troubleshooting
-===============
-Please be advised that currently games with a resolution above 320x240
-are disabled due to the limited screen resolution on the GCW0. This could be
-changed in the future, but higher resolution games will require use of
-an HDMI connection.
-
-In case you need to submit a bugreport, you may find the log file at the
-following path:
-
- /var/tmp/scummvm.log
-
-The log file is being overwritten at every ScummVM run.
diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
deleted file mode 100755
index 8bb20cecdc0..00000000000
--- a/backends/platform/dingux/build.gcw0.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
-
-# Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release --disable-engine=glk && make -j6 gcw-opk && ls -l scummvm.opk
diff --git a/backends/platform/dingux/dingux.cpp b/backends/platform/dingux/dingux.cpp
deleted file mode 100644
index e91f3a2f4cb..00000000000
--- a/backends/platform/dingux/dingux.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#if defined(DINGUX)
-
-#include "backends/platform/dingux/dingux.h"
-#include "backends/events/dinguxsdl/dinguxsdl-events.h"
-
-void OSystem_SDL_Dingux::initBackend() {
- ConfMan.registerDefault("fullscreen", true);
-
- // Create the events manager
- if (_eventSource == 0)
- _eventSource = new DINGUXSdlEventSource();
-
- // Call parent implementation of this method
- OSystem_POSIX::initBackend();
-}
-
-bool OSystem_SDL_Dingux::hasFeature(Feature f) {
- if (f == kFeatureFullscreenMode)
- return false;
-
- return OSystem_SDL::hasFeature(f);
-}
-
-#endif
diff --git a/backends/platform/dingux/dingux.h b/backends/platform/dingux/dingux.h
deleted file mode 100644
index 0e45eccb43d..00000000000
--- a/backends/platform/dingux/dingux.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef SDL_DINGUX_COMMON_H
-#define SDL_DINGUX_COMMON_H
-
-#if defined(DINGUX)
-
-#include "backends/platform/sdl/posix/posix.h"
-
-class OSystem_SDL_Dingux : public OSystem_POSIX {
-public:
- void initBackend();
- bool hasFeature(Feature f);
-};
-
-
-#endif /* DINGUX */
-#endif /* SDL_DINGUX_COMMON_H */
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
deleted file mode 100644
index 72a52cfb5f8..00000000000
--- a/backends/platform/dingux/dingux.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-DINGUX_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
-
-bundle_name = dingux-dist/scummvm
-gcw0_bundle = gcw0-opk
-
-all: $(DINGUX_EXE_STRIPPED)
-
-$(DINGUX_EXE_STRIPPED): $(EXECUTABLE)
- $(STRIP) $< -o $@
-
-dingux-distclean:
- rm -rf $(bundle_name)
- rm $(DINGUX_EXE_STRIPPED)
-
-dingux-dist: all
- $(MKDIR) $(bundle_name)
- $(MKDIR) $(bundle_name)/saves
- $(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm.elf
- $(CP) $(DIST_FILES_THEMES) $(bundle_name)/
-ifdef DIST_FILES_ENGINEDATA
- $(CP) $(DIST_FILES_ENGINEDATA) $(bundle_name)/
-endif
-ifdef DIST_FILES_NETWORKING
- $(CP) $(DIST_FILES_NETWORKING) $(bundle_name)/
-endif
-ifdef DIST_FILES_VKEYBD
- $(CP) $(DIST_FILES_VKEYBD) $(bundle_name)/
-endif
- $(CP) $(DIST_FILES_DOCS) $(bundle_name)/
-ifdef DYNAMIC_MODULES
- $(MKDIR) $(bundle_name)/plugins
- $(CP) $(PLUGINS) $(bundle_name)/plugins
- $(STRIP) $(bundle_name)/plugins/*
-endif
- $(CP) $(srcdir)/backends/platform/dingux/scummvm.gpe $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/dingux/README.DINGUX $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
-
-# Special target for generationg GCW-Zero OPK bundle
-$(gcw0_bundle): all
- $(MKDIR) $(gcw0_bundle)
- $(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
- $(MKDIR) $(gcw0_bundle)/themes
- $(CP) $(DIST_FILES_THEMES) $(gcw0_bundle)/themes/
-ifdef DIST_FILES_ENGINEDATA
- $(MKDIR) $(gcw0_bundle)/engine-data
- $(CP) $(DIST_FILES_ENGINEDATA) $(gcw0_bundle)/engine-data/
-endif
-ifdef DIST_FILES_NETWORKING
- $(CP) $(DIST_FILES_NETWORKING) $(gcw0_bundle)/
-endif
-ifdef DIST_FILES_VKEYBD
- $(CP) $(DIST_FILES_VKEYBD) $(gcw0_bundle)/
-endif
-ifdef DYNAMIC_MODULES
- $(MKDIR) $(gcw0_bundle)/plugins
- $(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
-endif
- $(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
-
- $(CP) $(srcdir)/dists/gcw0/scummvm.png $(gcw0_bundle)/
- $(CP) $(srcdir)/dists/gcw0/default.gcw0.desktop $(gcw0_bundle)/
- $(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
- $(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
- $(CP) $(srcdir)/backends/platform/dingux/README.GCW0 $(gcw0_bundle)/README.man.txt
- echo >> $(gcw0_bundle)/README.man.txt
- echo '[General README]' >> $(gcw0_bundle)/README.man.txt
- echo >> $(gcw0_bundle)/README.man.txt
- cat $(srcdir)/README.md | sed -e 's/\[/⟦/g' -e 's/\]/⟧/g' -e '/^1\.1)/,$$ s/^[0-9][0-9]*\.[0-9][0-9]*.*/\[&\]/' >> $(gcw0_bundle)/README.man.txt
-
-
-# $(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/
-
-gcw0-opk-unstripped: $(gcw0_bundle)
- $(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
- $(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
- $(srcdir)/dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
-
-gcw-opk: $(gcw0_bundle)
- $(STRIP) $(gcw0_bundle)/plugins/*
- $(STRIP) $(gcw0_bundle)/scummvm
- $(srcdir)/dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
-
-GeneralUser_GS_1.44-FluidSynth.zip:
- curl -s https://www.scummvm.org/frs/extras/SoundFont/GeneralUser_GS_1.44-FluidSynth.zip -o GeneralUser_GS_1.44-FluidSynth.zip
-
-GeneralUser\ GS\ FluidSynth\ v1.44.sf2: GeneralUser_GS_1.44-FluidSynth.zip
- unzip -n GeneralUser_GS_1.44-FluidSynth.zip
- mv "GeneralUser GS 1.44 FluidSynth/GeneralUser GS FluidSynth v1.44.sf2" .
- mv "GeneralUser GS 1.44 FluidSynth/README.txt" README.soundfont
- mv "GeneralUser GS 1.44 FluidSynth/LICENSE.txt" LICENSE.soundfont
diff --git a/backends/platform/dingux/main.cpp b/backends/platform/dingux/main.cpp
deleted file mode 100644
index f80c9087ad4..00000000000
--- a/backends/platform/dingux/main.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "backends/platform/dingux/dingux.h"
-#include "backends/plugins/sdl/sdl-provider.h"
-//#include "backends/plugins/posix/posix-provider.h"
-#include "base/main.h"
-
-#if defined(DINGUX)
-
-int main(int argc, char* argv[]) {
-
- g_system = new OSystem_SDL_Dingux();
- assert(g_system);
-
- g_system->init();
-
-#ifdef DYNAMIC_MODULES
- PluginManager::instance().addPluginProvider(new SDLPluginProvider());
-// PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
-#endif
-
- // Invoke the actual ScummVM main entry point:
- int res = scummvm_main(argc, argv);
-
- // Free OSystem
- g_system->destroy();
-
- return res;
-}
-
-#endif
diff --git a/backends/platform/dingux/module.mk b/backends/platform/dingux/module.mk
deleted file mode 100644
index c7ae8db48af..00000000000
--- a/backends/platform/dingux/module.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-MODULE := backends/platform/dingux
-
-MODULE_OBJS := \
- main.o \
- dingux.o
-
-# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
-MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
-OBJS := $(MODULE_OBJS) $(OBJS)
-MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
-
-# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
--include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/dingux/scummvm.gpe b/backends/platform/dingux/scummvm.gpe
deleted file mode 100644
index ce5d174a5c1..00000000000
--- a/backends/platform/dingux/scummvm.gpe
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-HOME=`pwd`
-$HOME/scummvm.elf
diff --git a/backends/platform/dingux/scummvm.png b/backends/platform/dingux/scummvm.png
deleted file mode 100644
index 1040b442ea2..00000000000
Binary files a/backends/platform/dingux/scummvm.png and /dev/null differ
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp
index a24bd0c3776..60eb3c90adb 100644
--- a/backends/platform/sdl/posix/posix-main.cpp
+++ b/backends/platform/sdl/posix/posix-main.cpp
@@ -21,7 +21,7 @@
#include "common/scummsys.h"
-#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(PSP2) && !defined(NINTENDO_SWITCH) && !defined(__EMSCRIPTEN__) && !defined(MIYOO) && !defined(MIYOOMINI)
+#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(OPENDINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(PSP2) && !defined(NINTENDO_SWITCH) && !defined(__EMSCRIPTEN__) && !defined(MIYOO) && !defined(MIYOOMINI)
#include "backends/platform/sdl/posix/posix.h"
#include "backends/plugins/sdl/sdl-provider.h"
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 20d2579f299..13ee46f1c21 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -43,7 +43,6 @@
#include "backends/mixer/null/null-mixer.h"
#include "backends/events/default/default-events.h"
-#include "backends/events/sdl/legacy-sdl-events.h"
#include "backends/keymapper/hardware-input.h"
#include "backends/mutex/sdl/sdl-mutex.h"
#include "backends/timer/sdl/sdl-timer.h"
diff --git a/configure b/configure
index 5ddad35108a..e4561d93ae0 100755
--- a/configure
+++ b/configure
@@ -852,7 +852,7 @@ Usage: $0 [OPTIONS]...
Configuration:
-h, --help display this help and exit
- --backend=BACKEND backend to build (3ds, atari, android, dc, dingux, ds, gcw0,
+ --backend=BACKEND backend to build (3ds, atari, android, dc, ds,
ios7, maemo, n64, null, opendingux, openpandora,
psp, psp2, samsungtv, sdl, switch, wii) [sdl]
@@ -885,12 +885,10 @@ Special configuration feature:
android-arm64-v8a for Android ARMv8-A (arm64-v8a)
android-x86 for Android x86
android-x86_64 for Android x86_64
- dingux for Dingux
raspberrypi for Raspberry Pi
dreamcast for Sega Dreamcast
ds for Nintendo DS
gamecube for Nintendo GameCube
- gcw0 for GCW Zero
ios7 for Apple iPhone / iPad (iOS >= 7)
ios7-arm64 for Apple iPhone / iPad (iOS >= 7, 64-bit)
kos32 for Kolibri OS
@@ -1698,7 +1696,7 @@ raspberrypi)
# It may change in the future.
_host_alias=arm-linux-gnueabihf
;;
-dingux | gcw0 | opendingux-*)
+opendingux-*)
_host_os=linux
_host_cpu=mipsel
_host_alias=mipsel-linux
@@ -3480,29 +3478,6 @@ if test -n "$_host"; then
_ranlib=$_host-ranlib
_strip=$_host-strip
;;
- dingux)
- append_var DEFINES "-DDISABLE_DOSBOX_OPL"
- append_var DEFINES "-DREDUCE_MEMORY_USAGE"
- append_var CXXFLAGS "-msoft-float"
- append_var CXXFLAGS "-mips32"
- _backend="dingux"
- _mt32emu=no
- _nuked_opl=no
- _optimization_level=-O3
- # Disable alsa midi to get the port build on OpenDingux toolchain
- _alsa=no
- # Disable cloud and SDL_Net due to outdated toolchain
- _cloud=no
- _sdlnet=no
- _libcurl=no
- _vkeybd=yes
- _build_hq_scalers=no
- # Force disable vorbis on dingux, it has terrible performance compared to tremor
- _vorbis=no
- # Force disable seq on dingux, no way to use it and it would get enabled by default with configure
- _seq_midi=no
- _port_mk="backends/platform/dingux/dingux.mk"
- ;;
wasm*-emscripten)
_backend="sdl"
# Disable cloud and SDL_Net as this is handled in the browser
@@ -3600,23 +3575,6 @@ if test -n "$_host"; then
add_line_to_config_h "/* #define DEBUG_WII_GDB_NETWORK */"
add_line_to_config_h "#define USE_WII_DI"
;;
- gcw0)
- _sysroot=`$CXX --print-sysroot`
- _sdlpath=$_sysroot/usr/bin
- append_var DEFINES "-DGCW0"
- append_var DEFINES "-DREDUCE_MEMORY_USAGE"
- append_var CXXFLAGS "-mips32"
- _backend="dingux"
- _alsa=no
- _mt32emu=no
- _seq_midi=no
- _timidity=no
- _build_scalers=no
- _optimization_level=-O3
- _vkeybd=yes
- _vorbis=no
- _port_mk="backends/platform/dingux/dingux.mk"
- ;;
ios7*)
add_line_to_config_mk 'IPHONE = 1'
append_var DEFINES "-DIPHONE -DIPHONE_IOS7"
@@ -3996,11 +3954,6 @@ case $_backend in
append_var LDFLAGS "-lronin -lm"
fi
;;
- dingux)
- append_var DEFINES "-DDINGUX"
- _sdlconfig=sdl-config
- _sdl=auto
- ;;
ds)
append_var INCLUDES '-I$(srcdir)/backends/platform/ds'
;;
@@ -4461,7 +4414,7 @@ fi
# Enable 16bit support only for backends which support it
#
case $_backend in
- 3ds | android | dingux | dc | ds | ios7 | kolibrios | maemo | null | opendingux | miyoomini | miyoo | openpandora | psp | psp2 | samsungtv | sdl | switch | wii)
+ 3ds | android | dc | ds | ios7 | kolibrios | maemo | null | opendingux | miyoomini | miyoo | openpandora | psp | psp2 | samsungtv | sdl | switch | wii)
if test "$_16bit" = auto ; then
_16bit=yes
else
@@ -4477,7 +4430,7 @@ esac
# Enable High resolution engines (>320x240) support only for backends which support it
#
case $_host in
- ds | dingux | gcw0)
+ ds)
if test "$_highres" = yes ; then
_highres=yes
else
diff --git a/dists/gcw0/default.gcw0.desktop b/dists/gcw0/default.gcw0.desktop
deleted file mode 100644
index 9bbb8d5b598..00000000000
--- a/dists/gcw0/default.gcw0.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=ScummVM
-Comment=Interpreter for several adventure games
-Comment[pl]=Interpreter graficznych gier przygodowych
-Comment[sv]=Tolk för flera äventyrsspel
-Comment[he]=פרשן למספר משחקי הרפתק×ות
-Comment[de]=Interpreter für diverse Abenteuerspiele
-Comment[es]=Intérprete para varias aventuras gráficas
-Comment[ca]=Intèrpret per diverses aventures grà fiques
-Exec=scummvm.sh
-Icon=scummvm
-Terminal=false
-Type=Application
-Categories=games;
-StartupNotify=false
-X-OD-Manual=README.man.txt
-X-OD-NeedsDownscaling=true
diff --git a/dists/gcw0/opk_make.sh b/dists/gcw0/opk_make.sh
deleted file mode 100755
index bbe603e2baa..00000000000
--- a/dists/gcw0/opk_make.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-#
-# opk_make.sh
-#
-# This script is meant to ease generation of a opk file. Please consult the output
-# when running --help for a list of available parameters and an explanation of
-# those.
-#
-# Required tools when running the script:
-# bash
-# echo, cat, mv, rm, mksquashfs
-
-check_for_tool()
-{
- which $1 &> /dev/null
- if [ "$?" -ne "0" ];
- then
- cecho "ERROR: Could not find the program '$1'. Please make sure
-that it is available in your PATH since it is required to complete your request." $red
- exit 1
- fi
-}
-
-print_help()
-{
- cat << EOSTREAM
-opk_make.sh - A script to package "something" into a OPK.
-
-Usage:
- $(basename ${0}) {--directory|-d} <folder> {--opk|-o} <file> [{--help|-h}]
-
-
-Switches:
- --directory / -d Sets the folder that is to be used for the resulting opk
- to <folder>. This option is mandatory for the script to
- function correctly.
-
- --help / -h Displays this help text.
-
- --opkname / -o Sets the output filename of the resulting opk to <file>.
- This option is mandatory for the script to function
- correctly.
-
-A version >=4.0 of squashfs is required to be available in your PATH.
-EOSTREAM
-}
-
-
-# Parse command line parameters
-while [ "${1}" != "" ]; do
- if [ "${1}" = "--directory" ] || [ "${1}" = "-d" ];
- then
- FOLDER=$2
- shift 2
- elif [ "${1}" = "--help" ] || [ "${1}" = "-h" ];
- then
- print_help
- exit 0
- elif [ "${1}" = "--opkname" ] || [ "${1}" = "-o" ];
- then
- OPKNAME=$2
- shift 2
- else
- echo "ERROR: '$1' is not a known argument. Printing --help and aborting."
- print_help
- exit 1
- fi
-done
-
-
-# Probe if required variables were set
-echo "Checking if all required variables were set."
-if [ ! $OPKNAME ] || [ ! $FOLDER ];
-then
- echo "ERROR: Not all required options were set! Please see the --help information below."
- print_help
- exit 1
-else
- echo "OPKNAME set to '$OPKNAME'."
-fi
-# Check if the selected folder actually exists
-if [ ! -d $FOLDER ];
-then
- echo "ERROR: '$FOLDER' doesn't exist or is not a folder."
- exit 1
-else
- echo "FOLDER set to '$FOLDER'."
-fi
-
-# Make iso from folder
-echo "Creating an iso file based on '$FOLDER'."
-
-check_for_tool mksquashfs
-if [ $(mksquashfs -version | awk 'BEGIN{r=0} $3>=4{r=1} END{print r}') -eq 0 ];
-then
- echo "ERROR: Your squashfs version is older then version 4, please upgrade to 4.0 or later"
- exit 1
-fi
-mksquashfs $FOLDER $OPKNAME.opk -noappend -no-exports -no-xattrs
-
-# Final message
-if [ -f $OPKNAME ];
-then
- echo "Successfully finished creating the opk '$OPKNAME'."
-else
- echo "There seems to have been a problem and '$OPKNAME' was not created. Please check
-the output above for any error messages. A possible cause for this is that there was
-not enough space available."
- exit 1
-fi
-
diff --git a/dists/gcw0/scummvm.png b/dists/gcw0/scummvm.png
deleted file mode 100644
index 1040b442ea2..00000000000
Binary files a/dists/gcw0/scummvm.png and /dev/null differ
diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
deleted file mode 100755
index 7e2bbaf23ec..00000000000
--- a/dists/gcw0/scummvm.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-cd `dirname $0`
-
-if [ ! -f $HOME/.scummvmrc ] ; then
- cp ./scummvmrc $HOME/.scummvmrc
-fi
-
-exec ./scummvm 2>&1 >/var/tmp/scummvm.log
diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
deleted file mode 100644
index c2087c222a2..00000000000
--- a/dists/gcw0/scummvmrc
+++ /dev/null
@@ -1,9 +0,0 @@
-[scummvm]
-fullscreen=true
-gfx_mode=1x
-aspect_ratio=true
-themepath=./themes
-browser_lastpath=/media
-extrapath=./engine-data
-pluginspath=./plugins
-joystick_num=0
More information about the Scummvm-git-logs
mailing list