aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/dc
diff options
context:
space:
mode:
Diffstat (limited to 'backends/platform/dc')
-rw-r--r--backends/platform/dc/DCLauncherDialog.h3
-rw-r--r--backends/platform/dc/Makefile10
-rw-r--r--backends/platform/dc/audio.cpp3
-rw-r--r--backends/platform/dc/dc-fs.cpp5
-rw-r--r--backends/platform/dc/dc.h5
-rw-r--r--backends/platform/dc/dcloader.cpp3
-rw-r--r--backends/platform/dc/dcloader.h3
-rw-r--r--backends/platform/dc/dcmain.cpp8
-rw-r--r--backends/platform/dc/display.cpp5
-rw-r--r--backends/platform/dc/dreamcast.mk2
-rw-r--r--backends/platform/dc/icon.cpp3
-rw-r--r--backends/platform/dc/icon.h3
-rw-r--r--backends/platform/dc/input.cpp5
-rw-r--r--backends/platform/dc/label.cpp3
-rw-r--r--backends/platform/dc/label.h3
-rw-r--r--backends/platform/dc/plugins.cpp3
-rw-r--r--backends/platform/dc/portdefs.h3
-rw-r--r--backends/platform/dc/selector.cpp5
-rw-r--r--backends/platform/dc/softkbd.cpp3
-rw-r--r--backends/platform/dc/softkbd.h3
-rw-r--r--backends/platform/dc/time.cpp3
-rw-r--r--backends/platform/dc/vmsave.cpp8
22 files changed, 24 insertions, 68 deletions
diff --git a/backends/platform/dc/DCLauncherDialog.h b/backends/platform/dc/DCLauncherDialog.h
index 0ac7971847..72df3e15cc 100644
--- a/backends/platform/dc/DCLauncherDialog.h
+++ b/backends/platform/dc/DCLauncherDialog.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$
- *
*/
class DCLauncherDialog {
diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile
index 9586572435..00d408fdaf 100644
--- a/backends/platform/dc/Makefile
+++ b/backends/platform/dc/Makefile
@@ -1,5 +1,3 @@
-# $URL$
-# $Id$
ronindir = /usr/local/ronin
@@ -12,10 +10,14 @@ CC = sh-elf-gcc -ml -m4-single-only
CXX = sh-elf-g++ -ml -m4-single-only
LD = $(CXX)
CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
-DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR -DNOSERIAL
+DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR
+# For release builds:
+#DEFINES := -DNOSERIAL
LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
INCLUDES= -I./ -I$(srcdir) -I$(ronindir)/include/ -I$(srcdir)/engines
-LIBS = -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
+LIBS = -L$(ronindir)/lib -lmad -lronin -lz -lm
+# For release builds:
+#LIBS = -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
EXECUTABLE = scummvm.elf
DEPDIR = .deps
CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp
index ae63186d8c..1fee970a90 100644
--- a/backends/platform/dc/audio.cpp
+++ b/backends/platform/dc/audio.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>
diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp
index e21a12fa33..16547456c3 100644
--- a/backends/platform/dc/dc-fs.cpp
+++ b/backends/platform/dc/dc-fs.cpp
@@ -17,11 +17,10 @@
* You should have received a copy of the GNU General Public License
* 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$
*/
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
+
#include "dc.h"
#include "backends/fs/abstract-fs.h"
#include "backends/fs/stdiostream.h"
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index 060eff2b48..e31b817d7c 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.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$
- *
*/
#include "backends/base-backend.h"
@@ -56,7 +53,7 @@ class DCHardware {
};
class DCCDManager : public DefaultAudioCDManager {
- // Initialise the specified CD drive for audio playback.
+ // Initialize the specified CD drive for audio playback.
bool openCD(int drive);
// Poll cdrom status
diff --git a/backends/platform/dc/dcloader.cpp b/backends/platform/dc/dcloader.cpp
index db0160b953..675f7ad8c7 100644
--- a/backends/platform/dc/dcloader.cpp
+++ b/backends/platform/dc/dcloader.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 <ronin/ronin.h>
diff --git a/backends/platform/dc/dcloader.h b/backends/platform/dc/dcloader.h
index 95b1376b0f..1782467acd 100644
--- a/backends/platform/dc/dcloader.h
+++ b/backends/platform/dc/dcloader.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$
- *
*/
#ifndef DC_DCLOADER_H
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index f9640130d3..dfce176e90 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -18,11 +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$
- *
*/
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
#include <common/scummsys.h>
#include <engines/engine.h>
#include <base/main.h>
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index b297022775..56eef870c0 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.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$
- *
*/
#define RONIN_TIMER_ACCESS
@@ -720,7 +717,7 @@ Graphics::Surface *OSystem_Dreamcast::lockScreen()
_framebuffer.w = _screen_w;
_framebuffer.h = _screen_h;
_framebuffer.pitch = SCREEN_W*2;
- _framebuffer.bytesPerPixel = (_screenFormat == 0? 1 : 2);
+ _framebuffer.format = screenFormats[_screenFormat];
return &_framebuffer;
}
diff --git a/backends/platform/dc/dreamcast.mk b/backends/platform/dc/dreamcast.mk
index 666e03eece..9d8a53e25a 100644
--- a/backends/platform/dc/dreamcast.mk
+++ b/backends/platform/dc/dreamcast.mk
@@ -1,5 +1,3 @@
-# $URL$
-# $Id$
ronindir = /usr/local/ronin
diff --git a/backends/platform/dc/icon.cpp b/backends/platform/dc/icon.cpp
index dc19214bed..cf7afc82e0 100644
--- a/backends/platform/dc/icon.cpp
+++ b/backends/platform/dc/icon.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 <ronin/ronin.h>
diff --git a/backends/platform/dc/icon.h b/backends/platform/dc/icon.h
index 41ff2da5fa..e412e67a84 100644
--- a/backends/platform/dc/icon.h
+++ b/backends/platform/dc/icon.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$
- *
*/
#ifndef DC_ICON_H
diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp
index 5d4ed7ce96..7054ad196e 100644
--- a/backends/platform/dc/input.cpp
+++ b/backends/platform/dc/input.cpp
@@ -18,11 +18,10 @@
* 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$
- *
*/
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#define RONIN_TIMER_ACCESS
#include <common/scummsys.h>
diff --git a/backends/platform/dc/label.cpp b/backends/platform/dc/label.cpp
index 5ad75cd20d..1094dd3fb4 100644
--- a/backends/platform/dc/label.cpp
+++ b/backends/platform/dc/label.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 <ronin/ronin.h>
diff --git a/backends/platform/dc/label.h b/backends/platform/dc/label.h
index 776a660a84..6b96175d29 100644
--- a/backends/platform/dc/label.h
+++ b/backends/platform/dc/label.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$
- *
*/
#ifndef DC_LABEL_H
diff --git a/backends/platform/dc/plugins.cpp b/backends/platform/dc/plugins.cpp
index 44b8960513..fff3c147ec 100644
--- a/backends/platform/dc/plugins.cpp
+++ b/backends/platform/dc/plugins.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"
diff --git a/backends/platform/dc/portdefs.h b/backends/platform/dc/portdefs.h
index eaebc0f7da..ca2b5208a3 100644
--- a/backends/platform/dc/portdefs.h
+++ b/backends/platform/dc/portdefs.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$
- *
*/
#include <sys/types.h>
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index 8fd12d66bf..859f2a40ed 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -18,11 +18,10 @@
* 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$
- *
*/
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include <common/scummsys.h>
#include <engines/engine.h>
#include <engines/metaengine.h>
diff --git a/backends/platform/dc/softkbd.cpp b/backends/platform/dc/softkbd.cpp
index 112eb0c1c0..076f826d1c 100644
--- a/backends/platform/dc/softkbd.cpp
+++ b/backends/platform/dc/softkbd.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>
diff --git a/backends/platform/dc/softkbd.h b/backends/platform/dc/softkbd.h
index bedb9baaca..8f87d12baa 100644
--- a/backends/platform/dc/softkbd.h
+++ b/backends/platform/dc/softkbd.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$
- *
*/
#ifndef DC_SOFTKBD_H
diff --git a/backends/platform/dc/time.cpp b/backends/platform/dc/time.cpp
index c87062d583..c343852321 100644
--- a/backends/platform/dc/time.cpp
+++ b/backends/platform/dc/time.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$
- *
*/
#define RONIN_TIMER_ACCESS
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index 6c8289684f..f18f69efa6 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -18,11 +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$
- *
*/
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+
#include <common/scummsys.h>
#include "engines/engine.h"
#include "dc.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-16 11:33:24 +0000