[Scummvm-git-logs] scummvm master -> e19d4e197bc2dc90e929bba93ec97ea92b545765
sev-
sev at scummvm.org
Thu Nov 26 14:10:06 UTC 2020
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:
e19d4e197b AMIGAOS: Keep platform name continuity (#2643)
Commit: e19d4e197bc2dc90e929bba93ec97ea92b545765
https://github.com/scummvm/scummvm/commit/e19d4e197bc2dc90e929bba93ec97ea92b545765
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-11-26T15:10:01+01:00
Commit Message:
AMIGAOS: Keep platform name continuity (#2643)
Changed paths:
A backends/fs/amigaos/amigaos-fs-factory.cpp
A backends/fs/amigaos/amigaos-fs-factory.h
A backends/fs/amigaos/amigaos-fs.cpp
A backends/fs/amigaos/amigaos-fs.h
A dists/amigaos/Ext_Inst_so.rexx
A dists/amigaos/RM2AG.rexx
A dists/amigaos/RM2AG.rexx.in
A dists/amigaos/convertRM.sed
A dists/amigaos/scummvm.info
A dists/amigaos/scummvm_drawer.info
R backends/fs/amigaos4/amigaos4-fs-factory.cpp
R backends/fs/amigaos4/amigaos4-fs-factory.h
R backends/fs/amigaos4/amigaos4-fs.cpp
R backends/fs/amigaos4/amigaos4-fs.h
R dists/amiga/Ext_Inst_so.rexx
R dists/amiga/RM2AG.rexx
R dists/amiga/RM2AG.rexx.in
R dists/amiga/convertRM.sed
R dists/amiga/scummvm.info
R dists/amiga/scummvm_drawer.info
Makefile.common
backends/events/sdl/sdl-events.cpp
backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
backends/module.mk
backends/platform/null/null.cpp
backends/platform/sdl/amigaos/amigaos-main.cpp
backends/platform/sdl/amigaos/amigaos.cpp
backends/platform/sdl/amigaos/amigaos.mk
configure
engines/grim/gfx_opengl.cpp
diff --git a/Makefile.common b/Makefile.common
index 4b7d5d63bd..a2fe53f131 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -223,7 +223,7 @@ endif
# Get the current version information
######################################################################
-# AmigaOS4's grep has a problem with "./" in pathnames, so use cat piped into grep.
+# AmigaOS grep command has a problem with "./" in pathnames, so use cat piped into grep instead.
VERSION = $(shell cat "${srcdir}/base/internal_version.h" | grep SCUMMVM_VERSION | cut -d\" -f2)
VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
@@ -231,12 +231,12 @@ VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
ifdef AMIGAOS
-# Amiga needs date in specific format for the version cookie
+# AmigaOS needs the date in a specific format for the version cookie.
AMIGA_DATE = $(shell gdate '+%d.%m.%Y')
VERFLAGS += -DAMIGA_DATE=\"$(AMIGA_DATE)\"
endif
ifdef MORPHOS
-# MorphOS needs date in specific format for the version cookie
+# MorphOS needs the date in a specific format for the version cookie.
AMIGA_DATE = $(shell date +"%-d.%-m.%Y")
VERFLAGS += -DAMIGA_DATE=\"$(AMIGA_DATE)\"
endif
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index dd40e0fbec..292ab95691 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -143,7 +143,7 @@ int SdlEventSource::mapKey(SDL_Keycode sdlKey, SDL_Keymod mod, Uint16 unicode) {
if (key >= Common::KEYCODE_F1 && key <= Common::KEYCODE_F9) {
return key - Common::KEYCODE_F1 + Common::ASCII_F1;
} else if (key >= Common::KEYCODE_KP0 && key <= Common::KEYCODE_KP9) {
- // WORKAROUND: Disable this change for AmigaOS4 as it is breaking numpad usage ("fighting") on that platform.
+ // WORKAROUND: Disable this change for AmigaOS as it's breaking numpad usage ("fighting") on that platform.
// This fixes bug #10558.
// The actual issue here is that the SCUMM engine uses ASCII codes instead of keycodes for input.
// See also the relevant FIXME in SCUMM's input.cpp.
diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.cpp b/backends/fs/amigaos/amigaos-fs-factory.cpp
similarity index 93%
rename from backends/fs/amigaos4/amigaos4-fs-factory.cpp
rename to backends/fs/amigaos/amigaos-fs-factory.cpp
index 4ca65e53a5..b34ef6e410 100644
--- a/backends/fs/amigaos4/amigaos4-fs-factory.cpp
+++ b/backends/fs/amigaos/amigaos-fs-factory.cpp
@@ -22,8 +22,8 @@
#if defined(__amigaos4__)
-#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
-#include "backends/fs/amigaos4/amigaos4-fs.h"
+#include "backends/fs/amigaos/amigaos-fs-factory.h"
+#include "backends/fs/amigaos/amigaos-fs.h"
AbstractFSNode *AmigaOSFilesystemFactory::makeRootFileNode() const {
return new AmigaOSFilesystemNode();
diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.h b/backends/fs/amigaos/amigaos-fs-factory.h
similarity index 100%
rename from backends/fs/amigaos4/amigaos4-fs-factory.h
rename to backends/fs/amigaos/amigaos-fs-factory.h
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos/amigaos-fs.cpp
similarity index 98%
rename from backends/fs/amigaos4/amigaos4-fs.cpp
rename to backends/fs/amigaos/amigaos-fs.cpp
index 1fd9da68e3..6404e357b1 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos/amigaos-fs.cpp
@@ -22,7 +22,7 @@
#if defined(__amigaos4__)
-#include "backends/fs/amigaos4/amigaos4-fs.h"
+#include "backends/fs/amigaos/amigaos-fs.h"
#include "backends/fs/stdiostream.h"
#include "common/debug.h"
#include "common/util.h"
@@ -83,7 +83,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
_bIsValid = false;
// WORKAROUND:
- // This is a workaround for a bug present in AmigaOS4's
+ // This is a workaround for a bug present in AmigaOS
// newlib.library 53.30 and lower.
// It will be removed once a fixed version of said library is
// available to the public.
@@ -481,4 +481,4 @@ bool AmigaOSFilesystemNode::createDirectory() {
return _bIsValid && _bIsDirectory;
}
-#endif //defined(__amigaos4__)
+#endif
diff --git a/backends/fs/amigaos4/amigaos4-fs.h b/backends/fs/amigaos/amigaos-fs.h
similarity index 100%
rename from backends/fs/amigaos4/amigaos4-fs.h
rename to backends/fs/amigaos/amigaos-fs.h
diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
index cf8605fb6c..2f7f820e25 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
@@ -421,10 +421,10 @@ bool OpenGLSdlGraphics3dManager::createOrUpdateGLContext(uint gameWidth, uint ga
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
#else
- // AmigaOS4's OpenGL implementation is close to 1.3. Until that changes we need
+ // The OpenGL implementation on AmigaOS4 is close to 1.3. Until that changes we need
// to use 1.3 as version or ScummVM will cease working at all on that platform.
// Profile Mask has to be 0 as well.
- // This will be revised and removed once AmigaOS4 supports 2.x or OpenGLES2.
+ // This will be revised and removed once AmigaOS4 supports OpenGL 2.x or OpenGLES2.
#ifdef __amigaos4__
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
diff --git a/backends/module.mk b/backends/module.mk
index 04a68499bb..9c34d4f4ea 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -242,8 +242,8 @@ endif
ifdef AMIGAOS
MODULE_OBJS += \
dialogs/amigaos/amigaos-dialogs.o \
- fs/amigaos4/amigaos4-fs.o \
- fs/amigaos4/amigaos4-fs-factory.o \
+ fs/amigaos/amigaos-fs.o \
+ fs/amigaos/amigaos-fs-factory.o \
midi/camd.o
endif
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 2dd11c68fa..bdf2af1b69 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -63,7 +63,7 @@ typedef void (*sighandler_t)(int);
* Include header files needed for the getFilesystemFactory() method.
*/
#if defined(__amigaos4__)
- #include "backends/fs/amigaos4/amigaos4-fs-factory.h"
+ #include "backends/fs/amigaos/amigaos-fs-factory.h"
#elif defined(__MORPHOS__)
#include "backends/fs/morphos/morphos-fs-factory.h"
#elif defined(POSIX)
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index e63f40091d..c598c3117f 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -24,16 +24,16 @@
#if defined(__amigaos4__)
-#include "backends/fs/amigaos4/amigaos4-fs.h"
+#include "backends/fs/amigaos/amigaos-fs.h"
#include "backends/platform/sdl/amigaos/amigaos.h"
#include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h"
int main(int argc, char *argv[]) {
- // The following will gather the application name and add the binary path
- // to a variable in AmigaOS4's ENV(ARC) system. It will then be placed in
- // AppPaths, so that ScummVM becomes AmiUpdate aware.
+ // The following will gather ScummVM's system application name
+ // and add the binary path to a variable in AmigaOS ENV(ARC) system.
+ // It will be added to AppPaths, so ScummVM becomes AmiUpdate aware.
const char *const appname = "ScummVM";
BPTR lock;
diff --git a/backends/platform/sdl/amigaos/amigaos.cpp b/backends/platform/sdl/amigaos/amigaos.cpp
index 7fb1248323..b423479d19 100644
--- a/backends/platform/sdl/amigaos/amigaos.cpp
+++ b/backends/platform/sdl/amigaos/amigaos.cpp
@@ -25,7 +25,7 @@
#ifdef __amigaos4__
#include "backends/platform/sdl/amigaos/amigaos.h"
-#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
+#include "backends/fs/amigaos/amigaos-fs-factory.h"
#include "backends/dialogs/amigaos/amigaos-dialogs.h"
void OSystem_AmigaOS::init() {
diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index bd0e15d2fa..504635603c 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -2,18 +2,18 @@
amigaosdist: $(EXECUTABLE) $(PLUGINS)
mkdir -p $(AMIGAOSPATH)
mkdir -p $(AMIGAOSPATH)/extras
- cp ${srcdir}/dists/amiga/scummvm_drawer.info $(AMIGAOSPATH).info
- cp ${srcdir}/dists/amiga/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info
+ cp ${srcdir}/dists/amigaos/scummvm_drawer.info $(AMIGAOSPATH).info
+ cp ${srcdir}/dists/amigaos/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info
ifdef DIST_FILES_DOCS
mkdir -p $(AMIGAOSPATH)/doc
cp -r $(srcdir)/doc/ $(AMIGAOSPATH)
cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)/doc/
# Prepare README.md for AmigaGuide conversion.
- cat ${srcdir}/README.md | sed -f ${srcdir}/dists/amiga/convertRM.sed > README.conv
+ cat ${srcdir}/README.md | sed -f ${srcdir}/dists/amigaos/convertRM.sed > README.conv
# AmigaOS AREXX has a problem when ${srcdir} is '.'.
# It will break with a "Program not found" error.
# Copy the script to cwd and, once it has finished, remove it.
- cp ${srcdir}/dists/amiga/RM2AG.rexx .
+ cp ${srcdir}/dists/amigaos/RM2AG.rexx .
rx RM2AG.rexx README.conv $(AMIGAOSPATH)/doc/
rm README.conv
rm RM2AG.rexx
@@ -40,7 +40,7 @@ ifdef DYNAMIC_MODULES
# Not every AmigaOS installation, especially vanilla ones,
# come with every mandatory shared library.
mkdir -p $(AMIGAOSPATH)/sobjs
- cp ${srcdir}/dists/amiga/Ext_Inst_so.rexx .
+ cp ${srcdir}/dists/amigaos/Ext_Inst_so.rexx .
rx Ext_Inst_so.rexx $(EXECUTABLE) $(AMIGAOSPATH)
rm Ext_Inst_so.rexx
endif
diff --git a/configure b/configure
index 711a28b55b..c9d2589b36 100755
--- a/configure
+++ b/configure
@@ -5434,7 +5434,7 @@ EOF
# Try different library names
if test "$_opengl_game_es2" = yes ; then
# 1) GLESv2 This is generally used by nearly all platforms for OpenGL ES 2
- # 2) ogles2 This is used by AmigaOS4 (and probably others)
+ # 2) ogles2 This is used by AmigaOS4 for OpenGL ES 2
_opengl_game_es2=no
for lib in "-lGLESv2" "-logles2"; do
if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib
diff --git a/dists/amiga/Ext_Inst_so.rexx b/dists/amigaos/Ext_Inst_so.rexx
similarity index 100%
rename from dists/amiga/Ext_Inst_so.rexx
rename to dists/amigaos/Ext_Inst_so.rexx
diff --git a/dists/amiga/RM2AG.rexx b/dists/amigaos/RM2AG.rexx
similarity index 98%
rename from dists/amiga/RM2AG.rexx
rename to dists/amigaos/RM2AG.rexx
index 2942480337..4326542f88 100644
--- a/dists/amiga/RM2AG.rexx
+++ b/dists/amigaos/RM2AG.rexx
@@ -1,7 +1,7 @@
/*
$VER: RM2AG.rexx 0.24 (23.08.2020) README(.md) to .guide converter.
This script converts a given markdown README file (right now, only
-ScummVM is supported) to a basic hypertext Amiga guide file and installs
+ScummVM is supported) to a basic hypertext AmigaGuide file and installs
it to a given path, if available.
*/
@@ -75,7 +75,7 @@ IF ~OPEN(guide_write,'README.guide','W') THEN DO
END
/*
-Prepare the Amiga guide file, add intro and fixed text.
+Prepare the AmigaGuide file, add intro and fixed text.
*/
CALL WRITELN guide_write,'@DATABASE ScummVM README.guide'
CALL WRITELN guide_write,'@$VER: ScummVM Readme 2.3.0git'
@@ -124,7 +124,6 @@ DO WHILE EOF(readme_read) = 0
Two chapters (1.0 and 7.8) are "empty", consisting of only
it`s chapter names. Link them to their respective sub chapters
(1.1 and 7.8.1) to not display a blank page.
-
If chapter 1.0 is found, add a link node to chapter 1.1.
*/
IF POS(' - [<>1.0<>)',working_line) = 1 THEN DO
@@ -228,7 +227,6 @@ DO WHILE EOF(readme_read) = 0
Two chapters (1.0 and 7.8) are "empty", consisting of only
it`s chapter names. Link them to their respective sub chapters
(1.1 and 7.8.1) to not display a blank page.
-
If chapter 1.1 is found, don`t close the NODE, just write the line.
*/
IF POS('<>1.1<>',working_line) = 1 THEN DO
diff --git a/dists/amiga/RM2AG.rexx.in b/dists/amigaos/RM2AG.rexx.in
similarity index 98%
rename from dists/amiga/RM2AG.rexx.in
rename to dists/amigaos/RM2AG.rexx.in
index b90e70f7b2..b3b92bb1be 100644
--- a/dists/amiga/RM2AG.rexx.in
+++ b/dists/amigaos/RM2AG.rexx.in
@@ -1,7 +1,7 @@
/*
$VER: RM2AG.rexx 0.24 (23.08.2020) README(.md) to .guide converter.
This script converts a given markdown README file (right now, only
-ScummVM is supported) to a basic hypertext Amiga guide file and installs
+ScummVM is supported) to a basic hypertext AmigaGuide file and installs
it to a given path, if available.
*/
@@ -75,7 +75,7 @@ IF ~OPEN(guide_write,'README.guide','W') THEN DO
END
/*
-Prepare the Amiga guide file, add intro and fixed text.
+Prepare the AmigaGuide file, add intro and fixed text.
*/
CALL WRITELN guide_write,'@DATABASE ScummVM README.guide'
CALL WRITELN guide_write,'@$VER: ScummVM Readme @VERSION@'
diff --git a/dists/amiga/convertRM.sed b/dists/amigaos/convertRM.sed
similarity index 98%
rename from dists/amiga/convertRM.sed
rename to dists/amigaos/convertRM.sed
index 049244459e..405d17879d 100644
--- a/dists/amiga/convertRM.sed
+++ b/dists/amigaos/convertRM.sed
@@ -1,17 +1,17 @@
-# $VER: READMEconverter.sed 1.05 (25.01.2018) © Eugene "sev" Sandulenko
-# Additions and changes by Raziel
-#
-# Preprocessing the README file and adding some markers for easier parsing
-# and later converting it to an AmigaGuide Hypertext file.
-#
-s/http:\/\/[#?=&a-zA-Z0-9_.\/\-]*/@{"&" System "URLOpen &"}/ # Convert all URLs to AmigaGuide format
-s/https:\/\/[#?=&a-zA-Z0-9_.\/\-]*/@{"&" System "URLOpen &"}/ # Convert all secure URLs to AmigaGuide format
-s/[0-9][0-9]*\.[0-9][0-9]*/<>&<>/ # Convert all chapter numbers to <>x<>...
-s/<>\([0-9][0-9]*\.[0-9][0-9]*\)<>\(\.[0-9]\)/<>\1\2<>/ # ...and all three-digit chapter numbers...
-s/<>\([01]\.[0-9][0-9]*\.[0-9][0-9]*\)<>/\1/ # ...and restore mentioned version numbers like 1.0.0 and 0.7.0.
-s/of <>0\.0<>/of 0.0/ # "Fluidsynth's gain setting of 0.0" is not a chapter reference.
-s/through <>10\.0<>/through 10.0/ # "through 10.0" is not a chapter reference.
-s/ttf-<>2\.00.1<>/ttf-2.00.1/ # This part of an url link is not a chapter reference.
-s/patch <>1\.2<>/patch 1.2/ # "Zork patch 1.2" is not a chapter reference.
-s/Mac OS X <>10\.2.8<>/Mac OS X 10.2.8/ # "Mac OS X 10.2.8" is not a chapter reference.
-s/Mac_OS_X_<>10\.2.8<>/Mac_OS_X_10.2.8/ # "Mac_OS_X_10.2.8" is not a chapter reference.
+# $VER: READMEconverter.sed 1.05 (25.01.2018) © Eugene "sev" Sandulenko
+# Additions and changes by Raziel
+#
+# Preprocessing the README file and adding some markers for easier parsing
+# and later converting it to an AmigaGuide Hypertext file.
+#
+s/http:\/\/[#?=&a-zA-Z0-9_.\/\-]*/@{"&" System "URLOpen &"}/ # Convert all URLs to AmigaGuide format
+s/https:\/\/[#?=&a-zA-Z0-9_.\/\-]*/@{"&" System "URLOpen &"}/ # Convert all secure URLs to AmigaGuide format
+s/[0-9][0-9]*\.[0-9][0-9]*/<>&<>/ # Convert all chapter numbers to <>x<>...
+s/<>\([0-9][0-9]*\.[0-9][0-9]*\)<>\(\.[0-9]\)/<>\1\2<>/ # ...and all three-digit chapter numbers...
+s/<>\([01]\.[0-9][0-9]*\.[0-9][0-9]*\)<>/\1/ # ...and restore mentioned version numbers like 1.0.0 and 0.7.0.
+s/of <>0\.0<>/of 0.0/ # "Fluidsynth's gain setting of 0.0" is not a chapter reference.
+s/through <>10\.0<>/through 10.0/ # "through 10.0" is not a chapter reference.
+s/ttf-<>2\.00.1<>/ttf-2.00.1/ # This part of an url link is not a chapter reference.
+s/patch <>1\.2<>/patch 1.2/ # "Zork patch 1.2" is not a chapter reference.
+s/Mac OS X <>10\.2.8<>/Mac OS X 10.2.8/ # "Mac OS X 10.2.8" is not a chapter reference.
+s/Mac_OS_X_<>10\.2.8<>/Mac_OS_X_10.2.8/ # "Mac_OS_X_10.2.8" is not a chapter reference.
diff --git a/dists/amiga/scummvm.info b/dists/amigaos/scummvm.info
similarity index 100%
rename from dists/amiga/scummvm.info
rename to dists/amigaos/scummvm.info
diff --git a/dists/amiga/scummvm_drawer.info b/dists/amigaos/scummvm_drawer.info
similarity index 100%
rename from dists/amiga/scummvm_drawer.info
rename to dists/amigaos/scummvm_drawer.info
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index 4f69f8ecc0..aba5ec83c3 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -1742,7 +1742,7 @@ void GfxOpenGL::prepareMovieFrame(Graphics::Surface *frame) {
format = GL_BGRA;
dataType = GL_UNSIGNED_INT_8_8_8_8;
#else
- // AmigaOS' MiniGL does not understand GL_UNSIGNED_INT_8_8_8_8 yet.
+ // MiniGL on AmigaOS4 doesn't understand GL_UNSIGNED_INT_8_8_8_8 yet.
format = GL_BGRA;
dataType = GL_UNSIGNED_BYTE;
#endif
@@ -1752,7 +1752,7 @@ void GfxOpenGL::prepareMovieFrame(Graphics::Surface *frame) {
format = GL_BGRA;
dataType = GL_UNSIGNED_INT_8_8_8_8;
#else
- // AmigaOS' MiniGL does not understand GL_UNSIGNED_INT_8_8_8_8 yet.
+ // MiniGL on AmigaOS4 doesn't understand GL_UNSIGNED_INT_8_8_8_8 yet.
format = GL_BGRA;
dataType = GL_UNSIGNED_BYTE;
#endif
More information about the Scummvm-git-logs
mailing list