[Scummvm-git-logs] scummvm master -> fd129ebc0cf1de36eef44fe5bc6820051658cbd9
aquadran
noreply at scummvm.org
Sat Jan 29 13:15:09 UTC 2022
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:
fd129ebc0c JANITORIAL: "Mac OS X" and "OS X" to "macOS" in comments
Commit: fd129ebc0cf1de36eef44fe5bc6820051658cbd9
https://github.com/scummvm/scummvm/commit/fd129ebc0cf1de36eef44fe5bc6820051658cbd9
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-29T14:15:05+01:00
Commit Message:
JANITORIAL: "Mac OS X" and "OS X" to "macOS" in comments
Apple's desktop operating system was formerly called "Mac OS X" and "OS X", but since 2016 it has been called "macOS" (starting with version 10.12).
Changing across all comments and documentation to use this current terminology, except in cases where the historical versions are explicitly referenced. No code changes are made; we should consider changing those in future PRs.
Changed paths:
AUTHORS
Makefile.common
backends/audiocd/macosx/macosx-audiocd.cpp
backends/audiocd/macosx/macosx-audiocd.h
backends/events/default/default-events.cpp
backends/fs/posix/posix-fs-factory.cpp
backends/fs/posix/posix-fs.cpp
backends/midi/coreaudio.cpp
backends/midi/coremidi.cpp
backends/platform/sdl/macosx/macosx-window.h
backends/platform/sdl/macosx/macosx.cpp
backends/saves/posix/posix-saves.cpp
backends/updates/macosx/macosx-updates.mm
backends/updates/win32/win32-updates.cpp
base/commandLine.cpp
common/lua/loadlib.cpp
common/lua/luaconf.h
common/stream.cpp
common/system.h
common/taskbar.h
common/updates.h
configure
devtools/create_classicmacfonts.sh
devtools/create_japanesemacfonts.sh
devtools/credits.pl
dists/scummvm.6
doc/QuickStart
doc/cz/PrectiMe
doc/da/HurtigStart
doc/de/LIESMICH
doc/de/Schnellstart
doc/docportal/help/credits.rst
doc/es/InicioRapido
doc/fr/DemarrageRapide
doc/it/GuidaRapida
doc/no-nb/HurtigStart
doc/se/LasMig
doc/se/Snabbstart
engines/ags/shared/core/platform.h
engines/cine/script_fw.cpp
engines/glk/tads/os_glk.h
engines/mohawk/livingbooks.cpp
engines/pegasus/movie.cpp
engines/pegasus/pegasus.cpp
engines/scumm/scumm.cpp
graphics/opengl/system_headers.h
gui/credits.h
gui/widgets/editable.cpp
image/pict.cpp
ports.mk
diff --git a/AUTHORS b/AUTHORS
index d8f498637d7..969d8b6aa2a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -606,7 +606,7 @@ ScummVM Team
Cpasjuste
rsn8887
- SDL (Win/Linux/OS X/etc.):
+ SDL (Win/Linux/macOS/etc.):
Max Horn - (retired)
Eugene Sandulenko - Asm routines, GFX layers
diff --git a/Makefile.common b/Makefile.common
index c87deec4021..22a11b58e0d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -171,7 +171,7 @@ ifdef CXX_UPDATE_DEP_FLAG
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $@
-# Build rules for Objective-C and Objective-C++ files. Strictly speaking, this is for OS X only.
+# Build rules for Objective-C and Objective-C++ files. Strictly speaking, this is for macOS only.
%.o: %.mm
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $@
diff --git a/backends/audiocd/macosx/macosx-audiocd.cpp b/backends/audiocd/macosx/macosx-audiocd.cpp
index 85e800297d2..e62dcd01b68 100644
--- a/backends/audiocd/macosx/macosx-audiocd.cpp
+++ b/backends/audiocd/macosx/macosx-audiocd.cpp
@@ -63,7 +63,7 @@
// Partially based on SDL's code
/**
- * The Mac OS X audio cd manager. Implements real audio cd playback.
+ * The macOS audio cd manager. Implements real audio cd playback.
*/
class MacOSXAudioCDManager : public DefaultAudioCDManager {
public:
diff --git a/backends/audiocd/macosx/macosx-audiocd.h b/backends/audiocd/macosx/macosx-audiocd.h
index 40e84fd4ba1..030bd9e01b3 100644
--- a/backends/audiocd/macosx/macosx-audiocd.h
+++ b/backends/audiocd/macosx/macosx-audiocd.h
@@ -50,7 +50,7 @@
class AudioCDManager;
/**
- * Create an audio CD manager for Mac OS X
+ * Create an audio CD manager for macOS
*/
AudioCDManager *createMacOSXAudioCDManager();
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 258446b3a2e..0c44318fb9f 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -109,7 +109,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
// WORKAROUND: Some engines incorrectly attempt to use the
// ascii value instead of the keycode to detect the backspace
// key (a non-portable behavior). This fails at least on
- // Mac OS X, possibly also on other systems.
+ // macOS, possibly also on other systems.
// As a workaround, we force the ascii value for backspace
// key pressed. A better fix would be for engines to stop
// making invalid assumptions about ascii values.
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp
index 6afd54935be..56fb7369e82 100644
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@@ -22,7 +22,7 @@
#if defined(POSIX) || defined(PLAYSTATION3) || defined(__DS__)
// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
-// Also with clock() in sys/time.h in some Mac OS X SDKs.
+// Also with clock() in sys/time.h in some macOS SDKs.
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp
index 5b2aac0b740..7e72d450cf4 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -22,7 +22,7 @@
#if defined(POSIX) || defined(PLAYSTATION3) || defined(PSP2) || defined(__DS__)
// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
-// Also with clock() in sys/time.h in some Mac OS X SDKs.
+// Also with clock() in sys/time.h in some macOS SDKs.
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp
index 0231b67b11b..0ee3dff4c17 100644
--- a/backends/midi/coreaudio.cpp
+++ b/backends/midi/coreaudio.cpp
@@ -34,14 +34,14 @@
// compatibility with all pre-10.5 systems.
//
// Since 10.5 was the last system to support PowerPC, we use the old, deprecated
-// APIs on PowerPC based systems by default. On all other systems (such as Mac
-// OS X running on Intel hardware, or iOS running on ARM), we use the new API by
+// APIs on PowerPC based systems by default. On all other systems (such as macOS
+// running on Intel hardware, or iOS running on ARM), we use the new API by
// default.
//
// This leaves Mac OS X 10.4 running on x86 processors as the only system
// combination that this code will not support by default. It seems quite
// reasonable to assume that anybody with an Intel system has since then moved
-// on to a newer Mac OS X release. But if for some reason you absolutely need to
+// on to a newer macOS release. But if for some reason you absolutely need to
// build an x86 version of this code using the old, deprecated API, you can
// simply do so by manually enable the USE_DEPRECATED_COREAUDIO_API switch (e.g.
// by adding setting it suitably in CPPFLAGS).
diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp
index 4e2b2dbbe21..7a0f5e662fa 100644
--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@@ -71,7 +71,7 @@ MidiDriver_CoreMIDI::MidiDriver_CoreMIDI(ItemCount device)
: mDevice(device), mClient(0), mOutPort(0), mDest(0) {
OSStatus err;
- err = MIDIClientCreate(CFSTR("ScummVM MIDI Driver for OS X"), NULL, NULL, &mClient);
+ err = MIDIClientCreate(CFSTR("ScummVM MIDI Driver for macOS"), NULL, NULL, &mClient);
}
MidiDriver_CoreMIDI::~MidiDriver_CoreMIDI() {
diff --git a/backends/platform/sdl/macosx/macosx-window.h b/backends/platform/sdl/macosx/macosx-window.h
index cd7c6b1ce27..defbf920a7c 100644
--- a/backends/platform/sdl/macosx/macosx-window.h
+++ b/backends/platform/sdl/macosx/macosx-window.h
@@ -28,7 +28,7 @@
class SdlWindow_MacOSX final : public SdlWindow {
public:
- // Use an iconless window on OS X, as we use a nicer external icon there.
+ // Use an iconless window on macOS, as we use a nicer external icon there.
void setupIcon() override {}
float getDpiScalingFactor() const override;
};
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index a20b74f4b5a..ec2e19a94a6 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -104,7 +104,7 @@ void OSystem_MacOSX::initBackend() {
TransMan.setLanguage(ConfMan.get("gui_language").c_str());
#endif // USE_TRANSLATION
- // Replace the SDL generated menu items with our own translated ones on Mac OS X
+ // Replace the SDL generated menu items with our own translated ones on macOS
replaceApplicationMenuItems();
#ifdef USE_SPARKLE
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
index d3ec9f21f80..28c796b7741 100644
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@@ -21,7 +21,7 @@
// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
-// Also with clock() in sys/time.h in some Mac OS X SDKs.
+// Also with clock() in sys/time.h in some macOS SDKs.
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h //On IRIX, sys/stat.h includes sys/time.h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#define FORBIDDEN_SYMBOL_EXCEPTION_getenv
diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm
index 67c4c7bc280..2a89a86610f 100644
--- a/backends/updates/macosx/macosx-updates.mm
+++ b/backends/updates/macosx/macosx-updates.mm
@@ -37,7 +37,7 @@
SUUpdater *sparkleUpdater;
/**
- * Sparkle is a software update framework for Mac OS X which uses appcasts for
+ * Sparkle is a software update framework for macOS which uses appcasts for
* release information. Appcasts are RSS-like XML feeds which contain information
* about the most current version at the time. If a new version is available, the
* user is presented the release-notes/changes/fixes and is asked if he wants to
diff --git a/backends/updates/win32/win32-updates.cpp b/backends/updates/win32/win32-updates.cpp
index c613ec65e14..fd9ffa96a9c 100644
--- a/backends/updates/win32/win32-updates.cpp
+++ b/backends/updates/win32/win32-updates.cpp
@@ -34,7 +34,7 @@
#include <winsparkle.h>
/**
- * Sparkle is a software update framework for Mac OS X which uses appcasts for
+ * Sparkle is a software update framework for macOS which uses appcasts for
* release information. Appcasts are RSS-like XML feeds which contain information
* about the most current version at the time. If a new version is available, the
* user is presented the release-notes/changes/fixes and is asked if he wants to
@@ -45,7 +45,7 @@
*
* WinSparkle is a heavily (to the point of being its almost-port) inspired by the
* Sparkle framework originally by Andy Matuschak that became the de facto standard
- * for software updates on OS X.
+ * for software updates on macOS.
* More detailed information is available at the following address:
* https://winsparkle.org/
*
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index adfbeb71c8f..19d3778f071 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -523,7 +523,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
// We defer checking whether this is a valid target to a later point.
return s;
} else {
- // On MacOS X prior to 10.9 the OS is sometimes adding a -psn_X_XXXXXX argument (where X are digits)
+ // On macOS prior to 10.9 the OS is sometimes adding a -psn_X_XXXXXX argument (where X are digits)
// to pass the process serial number. We need to ignore it to avoid an error.
// When using XCode it also adds -NSDocumentRevisionsDebugMode YES argument if XCode option
// "Allow debugging when using document Versions Browser" is on (which is the default).
diff --git a/common/lua/loadlib.cpp b/common/lua/loadlib.cpp
index 599e07f6c6c..4ae3e7daa1e 100644
--- a/common/lua/loadlib.cpp
+++ b/common/lua/loadlib.cpp
@@ -4,7 +4,7 @@
** See Copyright Notice in lua.h
**
** This module contains an implementation of loadlib for Unix systems
-** that have dlfcn, an implementation for Darwin (Mac OS X), an
+** that have dlfcn, an implementation for Darwin (macOS), an
** implementation for Windows, and a stub for other systems.
*/
diff --git a/common/lua/luaconf.h b/common/lua/luaconf.h
index b64baa5babb..bdb4cb68ece 100644
--- a/common/lua/luaconf.h
+++ b/common/lua/luaconf.h
@@ -657,7 +657,7 @@ union luai_Cast { double l_d; long l_l; };
** also add -DLUA_USE_DLOPEN.)
** If you do not want any kind of dynamic library, undefine all these
** options.
-** By default, _WIN32 gets LUA_DL_DLL and MAC OS X gets LUA_DL_DYLD.
+** By default, _WIN32 gets LUA_DL_DLL and macOS gets LUA_DL_DYLD.
*/
#if defined(LUA_USE_DLOPEN)
#define LUA_DL_DLOPEN
diff --git a/common/stream.cpp b/common/stream.cpp
index 9fe7c69f759..80495c95581 100644
--- a/common/stream.cpp
+++ b/common/stream.cpp
@@ -176,8 +176,8 @@ char *SeekableReadStream::readLine(char *buf, size_t bufSize, bool handleCR) {
// Check for CR or CR/LF
// * DOS and Windows use CRLF line breaks
- // * Unix and OS X use LF line breaks
- // * Macintosh before OS X used CR line breaks
+ // * Unix and macOS use LF line breaks
+ // * Macintosh before macOS used CR line breaks
if (c == CR && handleCR) {
// Look at the next char -- is it LF? If not, seek back
c = readByte();
diff --git a/common/system.h b/common/system.h
index 0ea162d605f..7ba90573db6 100644
--- a/common/system.h
+++ b/common/system.h
@@ -1620,7 +1620,7 @@ public:
/** Add system-specific Common::Archive objects to the given SearchSet.
* For example, on Unix, the directory corresponding to DATA_PATH (if set), or, on
- * Mac OS X, the 'Resource' dir in the app bundle.
+ * macOS, the 'Resource' dir in the app bundle.
*
* @todo Come up with a better name.
*
diff --git a/common/taskbar.h b/common/taskbar.h
index 7364959654b..00c569460a8 100644
--- a/common/taskbar.h
+++ b/common/taskbar.h
@@ -45,7 +45,7 @@ namespace Common {
* The TaskbarManager allows interaction with the ScummVM application icon:
* - in the taskbar on Windows 7 and later
* - in the launcher for Unity
- * - in the dock on Mac OS X
+ * - in the dock on macOS
* - ...
*
* This allows GUI code and engines to display a progress bar, an overlay icon and/or count
diff --git a/common/updates.h b/common/updates.h
index 6e31ea985ed..bb7b6655f10 100644
--- a/common/updates.h
+++ b/common/updates.h
@@ -38,7 +38,7 @@ namespace Common {
/**
* The UpdateManager allows configuring of the automatic update checking
* for systems that support it:
- * - using Sparkle on Mac OS X
+ * - using Sparkle on macOS
* - using WinSparkle on Windows
*
* Most of the update checking is completely automated and this class only
diff --git a/configure b/configure
index 80bbda6a4d8..dd48f5c89df 100755
--- a/configure
+++ b/configure
@@ -978,12 +978,12 @@ Optional Libraries:
--enable-opl2lpt enable OPL2LPT support
--with-sparkle-prefix=DIR prefix where sparkle is installed
- (OS X/Windows only - optional)
+ (macOS/Windows only - optional)
--disable-sparkle disable sparkle automatic update support
- [OS X/Windows only - autodetect]
+ [macOS/Windows only - autodetect]
--disable-osx-dock-plugin disable the NSDockTilePlugin support
- [Mac OS X only - autodetect]
+ [macOS only - autodetect]
--with-sdl-prefix=DIR prefix where the SDL package is installed (optional)
e.g., if sdl-config script is at:
@@ -4993,7 +4993,7 @@ define_in_config_if_yes $_cloud 'USE_CLOUD'
#
case $_host_os in
darwin*)
- # NSDockTilePlugIn was added in OS X 10.6, so will not be available when compiling on older OS X versions.
+ # NSDockTilePlugIn was added in OS X 10.6, so will not be available when compiling on older macOS versions.
echocheck "DockTilePlugin"
if test "$_osxdockplugin" = auto ; then
_osxdockplugin=no
@@ -5360,7 +5360,7 @@ if test "$_opengl_mode" != none ; then
2.0.*)
# SDL2 supports both OpenGL + OpenGL ES contexts.
- # However, Mac OS X only allows OpenGL context creation at
+ # However, macOS only allows OpenGL context creation at
# this time, thus we limit us to OpenGL on that platform.
case $_host_os in
darwin*)
@@ -5397,7 +5397,7 @@ fi
if test "$_opengl_glad" = "no" -a "$_opengl_mode" != "none"; then
# Try different header filenames
# 1) GL/gl.h This is usually used on POSIX and Windows systems
- # 2) OpenGL/gl.h This is used on Mac OS X
+ # 2) OpenGL/gl.h This is used on macOS
# 3) GLES2/gl2.h This is used for OpenGL ES 2.x
_opengl_can_compile=no
for i in "GL/gl.h" "OpenGL/gl.h" "GLES2/gl2.h"; do
diff --git a/devtools/create_classicmacfonts.sh b/devtools/create_classicmacfonts.sh
index 7373b990048..b2b1aeb61bf 100755
--- a/devtools/create_classicmacfonts.sh
+++ b/devtools/create_classicmacfonts.sh
@@ -19,7 +19,7 @@ echo_n() {
}
if test `uname` != "Darwin"; then
- echo This script is Mac OS X-only
+ echo This script is macOS-only
exit
fi
diff --git a/devtools/create_japanesemacfonts.sh b/devtools/create_japanesemacfonts.sh
index f3046ea5430..45d08e309f1 100755
--- a/devtools/create_japanesemacfonts.sh
+++ b/devtools/create_japanesemacfonts.sh
@@ -8,7 +8,7 @@ echo_n() {
}
if test `uname` != "Darwin"; then
- echo This script is Mac OS X-only
+ echo This script is macOS-only
exit
fi
diff --git a/devtools/credits.pl b/devtools/credits.pl
index e211795b2ba..d7436568a2e 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -5,7 +5,7 @@
# of the credits in other places from this source. In particular:
# - The AUTHORS file
# - The gui/credits.h header file
-# - The Credits.rtf file used by the Mac OS X port
+# - The Credits.rtf file used by the macOS port
# - The credits.yaml, alternative version for use on the website
# - The credits.rst file used by the manual
#
@@ -40,7 +40,7 @@ my @section_count = ( 0, 0, 0 );
if ($#ARGV >= 0) {
$mode = "TEXT" if ($ARGV[0] eq "--text"); # AUTHORS file
$mode = "CPP" if ($ARGV[0] eq "--cpp"); # credits.h (for use by about.cpp)
- $mode = "RTF" if ($ARGV[0] eq "--rtf"); # Credits.rtf (Mac OS X About box)
+ $mode = "RTF" if ($ARGV[0] eq "--rtf"); # Credits.rtf (macOS About box)
$mode = "YAML" if ($ARGV[0] eq "--yaml"); # YAML (Simple format, used in the Website)
$mode = "RST" if ($ARGV[0] eq "--rst"); # Restructured text (used in the manual)
}
@@ -624,7 +624,7 @@ begin_credits("Credits");
add_person("", "rsn8887", "");
end_section();
- begin_section("SDL (Win/Linux/OS X/etc.)");
+ begin_section("SDL (Win/Linux/macOS/etc.)");
add_person("Max Horn", "Fingolfin", "(retired)");
add_person("Eugene Sandulenko", "sev", "Asm routines, GFX layers");
end_section();
diff --git a/dists/scummvm.6 b/dists/scummvm.6
index efde6f348a6..7d4c1c2eb17 100644
--- a/dists/scummvm.6
+++ b/dists/scummvm.6
@@ -127,9 +127,9 @@ Internal FM-TOWNS YM2612 emulation (only usable in SCUMM FM-TOWNS games)
.It Em alsa
Output using ALSA sequencer device
.It Em core
-CoreAudio sound, for Mac OS X users
+CoreAudio sound, for macOS users
.It Em coremidi
-CoreMIDI sound, for Mac OS X users. Use only if you have a hardware MIDI
+CoreMIDI sound, for macOS users. Use only if you have a hardware MIDI
synthesizer.
.It Em seq
Use /dev/sequencer for MIDI, *nix users.
@@ -240,7 +240,7 @@ Set music tempo (in percent, 50-200) for SCUMM games (default: 100).
.It Ctrl-F5
Display the Global Menu
.It Cmd-q
-Quit (Mac OS X)
+Quit (macOS)
.It Ctrl-q
Quit (Most platforms)
.It Ctrl-u
@@ -289,7 +289,7 @@ MIDI driver.
.It Pa $HOME/.scummvmrc
Configuration file on UNIX.
.It Pa "$HOME/Library/Preferences/ScummVM Preferences"
-Configuration file on Mac OS X.
+Configuration file on macOS.
.El
.Sh EXAMPLES
Running the builtin game launcher:
diff --git a/doc/QuickStart b/doc/QuickStart
index 202dcc4b61c..67da8da17ba 100644
--- a/doc/QuickStart
+++ b/doc/QuickStart
@@ -44,7 +44,7 @@ well on the compatibility page. ScummVM is continually improving, so
check back often.
Among the systems on which you can play those games are regular desktop
-computers (running Windows, Linux, Mac OS X, ...), game consoles
+computers (running Windows, Linux, macOS, ...), game consoles
(Dreamcast, Nintendo DS & Wii, PSP, ...), smartphones (Android, iPhone,
Symbian ...) and more.
diff --git a/doc/cz/PrectiMe b/doc/cz/PrectiMe
index 63fc44de9b0..053f8057208 100644
--- a/doc/cz/PrectiMe
+++ b/doc/cz/PrectiMe
@@ -98,7 +98,7 @@ Původně byl navržen pro spouštěnà her SCUMM od LucasArts SCUMM, jako např
Postupem Äasu byla pÅ™idána podpora pro spoustu her mimo SCUMM a
ScummVM nynà také podporuje mnoho AGI a SCI her od Sierra (napÅ™. King's Quest 1-6, Space Quest 1-5, ...), Discworld 1 a 2, Simon the Sorcerer 1 and 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword I a II, Flight of the Amazon Queen, Gobliiins 1-3, série The Legend of Kyrandia, mnoho ze SCUMM her pro dÄ›ti od Humongous Entertainment (vÄetnÄ› her Freddi Fish a Putt Putt) a mnoho dalÅ¡Ãch. Na stránce kompatibility můžete najÃt úplný seznam s podrobnostmi, které adventury jsou podporovány a jak dobÅ™e. ScummVM je neustále zlepÅ¡ován a proto navÅ¡tÄ›vujte naÅ¡e stránky Äasto.
-Mezi systémy, na kterých můžete tyto hrát, jsou běžné stolnà poÄÃtaÄe (majÃcà Windows, Linux, Mac OS X, ...), hernà konzole
+Mezi systémy, na kterých můžete tyto hrát, jsou běžné stolnà poÄÃtaÄe (majÃcà Windows, Linux, macOS, ...), hernà konzole
(Dreamcast, Nintendo DS a Wii, PSP, ...), chytré telefony (Android, iPhone, Symbian ...) a dalÅ¡Ã.
V souÄasnosti je ScummVM stále velkou Äástà ve vývoji. Nezapomeňte, že i když se snažÃme zajistit, aby mnoho her bylo možno dokonÄit pouze s pár vážnými chybami, pády programu mohou nastat a my neposkytujeme žádné záruky. PÅ™es to vÅ¡echno, nÄ›které hry byly podporovány po dlouhou dobu
@@ -649,7 +649,7 @@ CD verze série Gobliiins obsahuje jednu velkou zvukovou stopu, kterou je třeba
3.12) Poznámky k Inherit the Earth: Quest for the Orb:
----- ------------------------------------------------
-Abyste mohli spustit verzi pro Mac OS X od Wyrmkeep musÃte data zkopÃrovat z CD na Váš pevný disk. Pokud použÃváte PC, pak se podÃvejte na:
+Abyste mohli spustit verzi pro macOS od Wyrmkeep musÃte data zkopÃrovat z CD na Váš pevný disk. Pokud použÃváte PC, pak se podÃvejte na:
<https://wiki.scummvm.org/index.php/HOWTO-Mac_Games>
@@ -937,7 +937,7 @@ Podporované platformy zahrnujà (mimo jiné):
UNIX (Linux, Solaris, IRIX, *BSD, ...)
Windows
- Mac OS X
+ macOS
AmigaOS
Android
BeOS
@@ -1183,7 +1183,7 @@ ScummVM podporuje různé zkratky ve hře. Lišà se mezi různými hrami SCUMM
SpoleÄné:
Ctrl-F5 - Zobrazà Globálnà Menu
- Cmd-q - UkonÄit (Mac OS X)
+ Cmd-q - UkonÄit (macOS)
Ctrl-q - UkonÄit (dalÅ¡Ã unixy vÄetnÄ› Linux)
Ctrl-z - UkonÄit (dalÅ¡Ã platformy)
Ctrl-u - Zeslabà všechny zvuky
@@ -1348,7 +1348,7 @@ Nezapomeňte, že použÃvánà Ctrl-f nebo Ctrl-g nenà doporuÄeno: hry mohou
Uložené hry jsou na nÄ›kterých platformách standardnÄ› umÃstÄ›ny do souÄasné složky a v jiných do pÅ™ednastavené složky. To můžete urÄit v souboru s nastavenÃm pomocà parametru savepath. PodÃvejte se na vzorový soubor s nastavenÃm dále v tomto souboru.
Platformy, které v souÄasnosti majà jiné výchozà složky jsou:
- Mac OS X:
+ macOS:
$HOME/Documents/ScummVM Savegames/
Jiné unixy:
@@ -1497,8 +1497,8 @@ Dostupné ve vÅ¡ech operaÄnÃch systémech, nebo potÅ™ebuje ruÄnà nastavenÃ.
towns - Vnitřnà emulace FM-TOWNS YM2612
(použitelné pouze v hrách SCUMM FM-TOWNS)
alsa - Výstup pomocà zaÅ™Ãzenà sekvenceru ALSA. Viz nÞe.
- core - Zvuk CoreAudio, pro uživatele Mac OS X.
- coremidi - Zvuk CoreMIDI, pro uživatele Mac OS X. PoužÃvejte pouze, pokud máte hardwarový syntezátor MIDI.
+ core - Zvuk CoreAudio, pro uživatele macOS.
+ coremidi - Zvuk CoreMIDI, pro uživatele macOS. PoužÃvejte pouze, pokud máte hardwarový syntezátor MIDI.
seq - Použità /dev/sequencer pro MIDI v systému *nix. Viz nÞe
timidity - PÅ™ipojenà k MIDI serveru TiMidity++. Viz nÞe.
windows - Windows MIDI. Použije zabudovaný sekvencer, pro Windows
@@ -1804,7 +1804,7 @@ StandardnÄ› je soubor s nastavenÃm uložen a naÄÃtán:
Pokud byla ve vaÅ¡em systému nainstalována dÅ™ÃvÄ›jÅ¡Ã verze ScummVM, bude ponecháno původnà výchozà umÃstÄ›nà '~/.scummvmrc'.
- Mac OS X:
+ macOS:
~/Library/Preferences/ScummVM Preferences
(zde ~ oznaÄuje VaÅ¡i domovskou složku)
@@ -2012,7 +2012,7 @@ Pro aktuálnà přehled o tom, jak ScummVM sestavit pro různé platformy, prohl
<https://wiki.scummvm.org/index.php/Compiling_ScummVM>
-Pokud sestavujete ve Windows, Linux nebo Mac OS X, potřebujete SDL-1.2.2
+Pokud sestavujete ve Windows, Linux nebo macOS, potřebujete SDL-1.2.2
Nebo novÄ›jÅ¡Ã (starÅ¡Ã verze mohou fungovat, ale nejsou podporovány) a podporovaný kompilátor. VÄ›tÅ¡ina kompilátorů, vÄetnÄ› GCC, mingw a novÄ›jÅ¡Ãch verzà Microsoft Visual C++ jsou podporovány. Pokud chcete použÃt stopy CD komprimované do MP3 nebo soubory .SOU, musÃte nainstalovat knihovnu MAD; podobnÄ› potÅ™ebujete vhodné knihovny pro komprimovaný zvuk pomocà Ogg Vorbis a FLAC. Pro komprimované uložené stavy je potÅ™eba mÃt zlib.
NÄ›které Äásti ScummVM, zvláštÄ› zvÄ›tÅ¡ovaÄe, majà vysoce optimalizované verze napsané v assembleru. Pokud si pÅ™ejete tuto možnost použÃt, potÅ™ebuje mÃt nainstalován assembler nasm (viz https://www.nasm.us/). Nezapomeňte, že v souÄasnosti máme pouze verze optimalizované pro x86 MMX, a nebudou sestaveny pro jiné procesory.
@@ -2035,9 +2035,9 @@ Na Windows můžete urÄit USE_WINDBG a pÅ™ipojit WinDbg pro procházenà ladÃc
PÅ™eÄtÄ›te si prosÃm:
<https://wiki.scummvm.org/index.php/Compiling_ScummVM/GCC>
- Mac OS X:
+ macOS:
PÅ™eÄtÄ›te si prosÃm:
- <https://wiki.scummvm.org/index.php/Mac_OS_X>
+ <https://wiki.scummvm.org/index.php/macOS>
AmigaOS4:
PÅ™eÄtÄ›te si prosÃm:
@@ -2063,10 +2063,10 @@ Na Windows můžete urÄit USE_WINDBG a pÅ™ipojit WinDbg pro procházenà ladÃc
PÅ™eÄtÄ›te si prosÃm:
<https://wiki.scummvm.org/index.php/Compiling_ScummVM/WebOS>
- Mac OS:
- * Mac OS X
+ macOS:
+ * macOS
PÅ™eÄtÄ›te si prosÃm:
- <https://wiki.scummvm.org/index.php/Mac_OS_X>
+ <https://wiki.scummvm.org/index.php/macOS>
* Mac OS X 10.2.8
PÅ™eÄtÄ›te si prosÃm:
<https://wiki.scummvm.org/index.php/Compiling_ScummVM/Mac_OS_X_10.2.8>
diff --git a/doc/da/HurtigStart b/doc/da/HurtigStart
index 96e8cb3e5bc..c0d507b28f2 100644
--- a/doc/da/HurtigStart
+++ b/doc/da/HurtigStart
@@ -43,7 +43,7 @@ oplysninger om, hvilke eventyr der understøttes og hvor godt, på
kompatibilitetssiden. ScummVM forbedres løbende, så vend ofte tilbage.
Blandt de systemer, som du kan spille disse spil på er regulære desktop
-computere (Windows, Linux, Mac OS X, ...), spillekonsoller (Dreamcast,
+computere (Windows, Linux, macOS, ...), spillekonsoller (Dreamcast,
Nintendo DS og Wii, PSP, ...), smartphones (Android, iPhone, Symbian...)
og flere.
diff --git a/doc/de/LIESMICH b/doc/de/LIESMICH
index 5ff4ea829aa..a57fe48af4f 100644
--- a/doc/de/LIESMICH
+++ b/doc/de/LIESMICH
@@ -123,7 +123,7 @@ schauen Sie öfter einmal vorbei.
Unter den Systemen, mit denen Sie diese Spiele spielen können, befinden sich
normale Schreibtisch-Computer (mit den Betriebssystemen Windows, Linux,
-Mac OS X, ...), Spielekonsolen (Dreamcast, Nintendo DS & Wii, PSP, ...),
+macOS, ...), Spielekonsolen (Dreamcast, Nintendo DS & Wii, PSP, ...),
Smartphones (Android, iPhone, Symbian ...) und einige weitere.
Zurzeit befindet sich ScummVM immer noch stark in der Entwicklung. Seien Sie
@@ -907,7 +907,7 @@ Sprachausgabe ist auch in diesem Titel und ihre Lautstärke wird deshalb ebenso
3.12) Hinweise zu Inherit the Earth: Quest for the Orb (Macintosh):
----- -------------------------------------------------------------
-Um die Wiederveröffentlichung des Spiels für Mac OS X von Wyrmkeep laufen zu
+Um die Wiederveröffentlichung des Spiels für macOS von Wyrmkeep laufen zu
lassen, müssen Sie die Daten von der CD auf die Festplatte kopieren. Wenn Sie an
einem PC arbeiten, lesen Sie hierfür:
@@ -1450,7 +1450,7 @@ Die unterstützten Plattformen beinhalten (aber beschränken sich nicht auf):
UNIX (Linux, Solaris, IRIX, *BSD, ...)
Windows
- Mac OS X
+ macOS
AmigaOS
Android
BeOS
@@ -1745,7 +1745,7 @@ zwischen SCUMM-Spielen und anderen Spielen.
Allgemein:
Strg+F5 - Zeigt globales Menü.
- Cmd+q - Beenden (Mac OS X)
+ Cmd+q - Beenden (macOS)
Strg+q - Beenden (andere UNIX-Systeme einschließlich Linux)
Alt+F4 - Beenden (Windows)
Strg+z ODER Alt+x - Beenden (andere Plattformen)
@@ -2012,7 +2012,7 @@ Verzeichnis gespeichert und bei anderen in voreingestellten Verzeichnissen.
Sehen Sie sich das Beispiel weiter unten in dieser Liesmich-Datei an.
Die folgenden Plattformen haben ein anderes Standard-Verzeichnis:
- Mac OS X:
+ macOS:
$HOME/Documents/ScummVM Savegames/
Andere UNIX-Systeme:
@@ -2702,7 +2702,7 @@ Standardmäßig wird die Konfigurationsdatei hier gespeichert und geladen:
das ursprüngliche Standard-Verzeichnis „~/.scummvm“ beibehalten. Dies wird
daran erkannt, dass der Pfad „~/.scummvm“ vorhanden ist.
- Mac OS X:
+ macOS:
~/Library/Preferences/ScummVM Preferences
(Hierbei bezieht sich ~ auf das Benutzerverzeichnis.)
@@ -2768,10 +2768,10 @@ Die folgenden Schlüsselwörter werden erkannt:
screenshotpath Text Verzeichnis für Bildschirmfotos
iconspath Text Verzeichnis, in dem nach Icons gesucht wird,
die für das ScummVM-Icon in der Windows-Taskbar
- oder im macOS X-Dock verwendet werden, wenn
+ oder im macOS-Dock verwendet werden, wenn
ein Spiel läuft. Die Icon-Dateien sollten nach
der Spiele-Kennung benannt werden und sich unter
- Windows im .ico-Format und unter macOS X im
+ Windows im .ico-Format und unter macOS im
.png-Format befinden.
versioninfo Text Die Version von ScummVM, welche diese
Konfigurationsdatei erstellt hat
@@ -3054,7 +3054,7 @@ screenshotpath=/pfad/zu/den/bildschirmfotos/
Wenn in der Konfigurationsdatei kein Bildschirmfoto-Verzeichnis angegeben ist, hängt
der Speicherort der Bildschirmfotos vom verwendeten Betriebssystem ab:
Windows: Im Verzeichnis "Users\Benutzername\Bilder\ScummVM Screenshots"
- macOS X: Auf dem Desktop.
+ macOS: Auf dem Desktop.
Alle anderen Betriebssysteme: Im aktuellen Verzeichnis.
@@ -3065,7 +3065,7 @@ Plattformen kompiliert, schauen Sie bitte in unserem Wiki nach, insbesondere auf
dieser Seite:
https://wiki.scummvm.org/index.php/Compiling_ScummVM
-Wenn Sie für Windows, Linux oder Mac OS X kompilieren, benötigen Sie SDL-1.2.2
+Wenn Sie für Windows, Linux oder macOS kompilieren, benötigen Sie SDL-1.2.2
oder höher (ältere Versionen funktionieren möglicherweise, haben aber keinen
Support) und einen unterstützten Compiler. Mehrere Compiler, einschließlich GCC,
mingw und neue Versionen von Microsoft Visual C++ werden unterstützt. Wenn Sie
@@ -3123,10 +3123,10 @@ Debug-Nachrichten zu durchsuchen
Weiterführende Informationen finden Sie unter:
https://wiki.scummvm.org/index.php/Compiling_ScummVM/WebOS
- Mac OS:
- * Mac OS X
+ macOS:
+ * macOS
Weiterführende Informationen finden Sie unter:
- https://wiki.scummvm.org/index.php/Mac_OS_X
+ https://wiki.scummvm.org/index.php/macOS
* Mac OS X 10.2.8
Weiterführende Informationen finden Sie unter:
https://wiki.scummvm.org/index.php/Compiling_ScummVM/Mac_OS_X_10.2.8
diff --git a/doc/de/Schnellstart b/doc/de/Schnellstart
index 9b22c46f075..ca538bb9c6c 100644
--- a/doc/de/Schnellstart
+++ b/doc/de/Schnellstart
@@ -51,7 +51,7 @@ schauen Sie öfter einmal vorbei.
Unter den Systemen, mit denen Sie diese Spiele spielen können, befinden sich
normale Schreibtisch-Computer (mit den Betriebssystemen Windows, Linux,
-Mac OS X, ...), Spielekonsolen (Dreamcast, Nintendo DS & Wii, PSP, ...),
+macOS, ...), Spielekonsolen (Dreamcast, Nintendo DS & Wii, PSP, ...),
Smartphones (Android, iPhone, Symbian ...) und einige weitere.
Zurzeit befindet sich ScummVM immer noch stark in der Entwicklung. Seien Sie
diff --git a/doc/docportal/help/credits.rst b/doc/docportal/help/credits.rst
index de203874f2c..05baa4b6eb1 100644
--- a/doc/docportal/help/credits.rst
+++ b/doc/docportal/help/credits.rst
@@ -1534,7 +1534,7 @@ PlayStation Vita
* - rsn8887
-
-SDL (Win/Linux/OS X/etc.)
+SDL (Win/Linux/macOS/etc.)
^^^^^^^^^^^^^^^^^^^^^^^^^
.. list-table::
diff --git a/doc/es/InicioRapido b/doc/es/InicioRapido
index 64ac2edc8d9..f8dcdbf03c9 100644
--- a/doc/es/InicioRapido
+++ b/doc/es/InicioRapido
@@ -47,7 +47,7 @@ emulación en la página de compatibilidad. ScummVM mejora continuamente,
asà que consúltala a menudo.
Estos juegos se pueden ejecutar en ordenadores de sobremesa (con
-Windows, Linux, Mac OS X...), videoconsolas (Dreamcast, Nintendo DS
+Windows, Linux, macOS...), videoconsolas (Dreamcast, Nintendo DS
y Wii, PSP...) y smartphones (Android, iPhone, Symbian...), entre
otros sistemas.
diff --git a/doc/fr/DemarrageRapide b/doc/fr/DemarrageRapide
index baec5add978..f8f66bf866b 100644
--- a/doc/fr/DemarrageRapide
+++ b/doc/fr/DemarrageRapide
@@ -48,7 +48,7 @@ connus sur la page de compatibilité. ScummVM évolue en permanence, donc
vérifier cette liste de compatibilités souvent.
Vous pouvez jouer à ces jeux sur des ordinateurs de bureau classiques
-(sous Windows, Linux, Mac OS X, ...), sur des consoles (Dreamcast,
+(sous Windows, Linux, macOS, ...), sur des consoles (Dreamcast,
Nintendo DS et Wii, PSP, ...), smartphones (Android, iPhone, Symbian
...) et plus encore.
diff --git a/doc/it/GuidaRapida b/doc/it/GuidaRapida
index 6bc23188a0d..70982e1011e 100644
--- a/doc/it/GuidaRapida
+++ b/doc/it/GuidaRapida
@@ -46,7 +46,7 @@ in che misura nella pagina di compatibilità . ScummVM è in
continuo miglioramento, quindi torna a dare un'occhiata ogni tanto.
Tra i sistemi sui quali puoi giocare ci sono i normali computer desktop
-(con Windows, Linux, Mac OS X, ...), varie console (Dreamcast, Nintendo
+(con Windows, Linux, macOS, ...), varie console (Dreamcast, Nintendo
DS & Wii, PSP, ...), smartphone (Android, iPhone, Symbian, ...) e
altri.
diff --git a/doc/no-nb/HurtigStart b/doc/no-nb/HurtigStart
index 6add3ffc478..d0e8b618a5d 100644
--- a/doc/no-nb/HurtigStart
+++ b/doc/no-nb/HurtigStart
@@ -45,7 +45,7 @@ og hvor godt de støttes på kompatibilitets-siden. ScummVM forbedres
stadig, så det kan lønne seg å kikke innom med jevne mellomrom.
Blant systemene som spillene nå kan spilles på, finner vi vanlige
-stasjonære datamaskiner (med Windows, Linux, Mac OS X, etc), spillkonsoller
+stasjonære datamaskiner (med Windows, Linux, macOS, etc), spillkonsoller
(Dreamcast, Nintendo DS & Wii, PSP, ...), smarttelefoner (Android,
iPhone, Symbian ...) mfl.
diff --git a/doc/se/LasMig b/doc/se/LasMig
index 1a7bbfffb6e..8a489c0dc22 100644
--- a/doc/se/LasMig
+++ b/doc/se/LasMig
@@ -70,7 +70,7 @@ Från början var programmet designat för att köra LucasArts SCUMM-spel, till
Med tiden har stöd lagts till för många spel som inte använder SCUMM-systemet och ScummVM stöder nu även många av Sierras AGI- och SCI-spel (till exempel King’s Quest 1-6, Space Quest 1-5, ...), Discworld 1 och 2, Simon the Sorcerer 1 och 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword I och II, Flight of the Amazon Queen, Gobliiins 1-3, Legend of Kyrandia-serien, många av Humongous Entertainments barnspel (inklusive Freddi Fish och Putt Putt-spelen) med flera. Du kan se en fullständig lista med delaljer om vilka äventyr som stöds och hur väl de fungerar på kompatibilitetssidan. ScummVM förbättras konstant, så håll ett öga på listan.
-Bland systemen du kan använda för att spela dessa spel räknas vanliga persondatorer (Windows, Linux, Mac OS X, ...) spelkonsoler (Dreamcast, Nintendo DS & Wii, PSP, ...), smartphones (Android, iPhone, Symbian ...) med flera.
+Bland systemen du kan använda för att spela dessa spel räknas vanliga persondatorer (Windows, Linux, macOS, ...) spelkonsoler (Dreamcast, Nintendo DS & Wii, PSP, ...), smartphones (Android, iPhone, Symbian ...) med flera.
Just nu är ScummVM fortfarande under utveckling. Var medveten om att trots att vi försöker se till att många spel kan avklaras utan att stöta på allvarliga buggar finns det ändå risk för krasher, och vi erbjuder inga garantier. Dock har många spel varit stödda av programmet väldigt länge och borde fungera utmärkt i vilken som helst av de senaste stabila versionerna. Du kan få en uppfattning om hur väl varje spel fungerar i ScummVM genom att titta på kompatibilitetssidan. Faktum är att ScummVM används kommersiellt för nyutgåvor av vissa spel på moderna plattformar. Alltså är många företag nöjda med mjukvarans kvalitet och hur väl programmet stöder spelen.
@@ -463,7 +463,7 @@ CD-versionerna av Gobliiins-spelen innehåller ett stort ljudspår som du måste
3.11) Notiser om Inherit the Earth: Quest for the Orb:
----- ------------------------------------------------
-För att spela nyutgåvan från Wyrmkeep för Mac OS X måste du kopiera datafilerna från CD:n till din hårddisk. Om du är PC-användare, hänvisa sedan till:
+För att spela nyutgåvan från Wyrmkeep för macOS måste du kopiera datafilerna från CD:n till din hårddisk. Om du är PC-användare, hänvisa sedan till:
https://wiki.scummvm.org/index.php/HOWTO-Mac_Games
@@ -619,7 +619,7 @@ Stödda plattformar inkluderar bl.a. följande:
UNIX (Linux, Solaris, IRIX, *BSD, ...)
Windows
- Mac OS X
+ macOS
AmigaOS
Android
BeOS
@@ -867,7 +867,7 @@ ScummVM stöder ett antal kortkommandon medan du spelar. De är olika för SCUMM
Gemensamma:
Ctrl-F5 - Öppnar menyn
- Cmd-q - Avsluta (Mac OS X)
+ Cmd-q - Avsluta (macOS)
Ctrl-q - Avsluta (andra system inklusive Linux)
Ctrl-z ELLER Alt-x - Avsluta (andra plattformar)
Ctrl-u - Stäng av allt ljud
@@ -1027,7 +1027,7 @@ Märk att trycka Ctrl-f och Ctrl-g inte rekommenderas: spel kan krasha när de s
Spardata lagras som standard i den aktiva katalogen på vissa plattformar och i förbestämda kataloger på andra plattformar. Du kan ställa in katalogen i konfigurationsfilen genom att ändra savepath-parametern. Se exempel för konfigurationsfilen senare i detta dokument.
Plattformar som för närvarande har annorlunda standardkataloger:
- Mac OS X:
+ macOS:
$HOME/Documents/ScummVM Savegames/
Övriga unix-system:
@@ -1170,8 +1170,8 @@ För de flesta operativsystemen och spelen använder ScummVM som standard MT-32
(fungerar endast i SCUMM FM-TOWNS-spel)
alsa - Uppspelning med ALSA sequencer-enhet. Se nedan.
- core - CoreAudio ljud, för Mac OS X användare.
- coremidi - CoreMIDI ljud, för Mac OS X användare. Använd endast om du har
+ core - CoreAudio ljud, för macOS användare.
+ coremidi - CoreMIDI ljud, för macOS användare. Använd endast om du har
en MIDI-synthesizer i hårdvaruform.
seq - Använd /dev/sequencer för MIDI, *nix användare. Se nedan.
timidity - Anslut till TiMidity++ MIDI-servern. Se nedan.
@@ -1467,7 +1467,7 @@ Som standard sparas och laddas konfigrationsfilen i:
Unix:
~/.scummvmrc
- Mac OS X:
+ macOS:
~/Library/Preferences/ScummVM Preferences
(här hänvisar ~ till din hemkatalog)
@@ -1719,7 +1719,7 @@ Om specialinställningarna inte visas måste spelet köras en gång eller lägga
För en uppdaterad överblick för hur man kompilerar ScummVM på diverse plattformar var god se vår Wiki, speciellt den här här sidan:
https://wiki.scummvm.org/index.php/Compiling_ScummVM
-Om du kompilerar för Windows, Linux eller Mac OS X behöver du SDL-1.2.2 eller senare (äldre versioner kan fungera, men stöds inte) och ett stött kompileringsprogram. Flera kompileringsprogram inklusive GCC, mingw och senare versioner av Microsoft Visual C++ stöds. Om du vill använda MP3-komprimerade CD-spår eller .SOU-filer måste du installera MAD-biblioteket; på samma sätt behöver du de nödvändiga biblioteken för Ogg Vorbis och FLAC-komprimerat ljud. För komprimerade spardata krävs zlib.
+Om du kompilerar för Windows, Linux eller macOS behöver du SDL-1.2.2 eller senare (äldre versioner kan fungera, men stöds inte) och ett stött kompileringsprogram. Flera kompileringsprogram inklusive GCC, mingw och senare versioner av Microsoft Visual C++ stöds. Om du vill använda MP3-komprimerade CD-spår eller .SOU-filer måste du installera MAD-biblioteket; på samma sätt behöver du de nödvändiga biblioteken för Ogg Vorbis och FLAC-komprimerat ljud. För komprimerade spardata krävs zlib.
Vissa delar av ScummVM, speciellt skalningsfilter, har optimerade versioner skrivna i assembler-kod. Om du vill använda dem måste du installera nasm-assemblern (se https://nasm.us/). Märk att vi för tillfället endast har optimerade versioner för x86 MMX och att de inte kan kompileras med andra processorer.
@@ -1744,9 +1744,9 @@ På Windows kan du definiera USE_WINDBG och lägga till WinDbg för att visa deb
* För mer information se:
https://wiki.scummvm.org/index.php/Compiling_ScummVM/VS2005
- Mac OS X:
+ macOS:
* Se till att du har utvecklingsverktygen istallerade.
- * SDL-utvecklingspaketet för OS X som finns tillgängligt på SLD:s hemsida
+ * SDL-utvecklingspaketet för macOS som finns tillgängligt på SLD:s hemsida
är INTE lämpligt. Du behöver istället en unix-artad kompilation av SDL.
Ett sätt att få tag i en sådan är att installera SDL via Fink
(http://www.finkproject.org/). Annars kan du kompilera SDL manuellt från källkoden
diff --git a/doc/se/Snabbstart b/doc/se/Snabbstart
index d19101065b6..fb192e76c93 100644
--- a/doc/se/Snabbstart
+++ b/doc/se/Snabbstart
@@ -21,7 +21,7 @@ Från början var programmet designat för att köra LucasArts SCUMM-spel, till
Med tiden har stöd lagts till för många spel som inte använder SCUMM-systemet och ScummVM stöder nu även många av Sierras AGI- och SCI-spel (till exempel King’s Quest 1-6, Space Quest 1-5, ...), Discworld 1 och 2, Simon the Sorcerer 1 och 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword I och II, Flight of the Amazon Queen, Gobliiins 1-3, Legend of Kyrandia-serien, många av Humongous Entertainments barnspel (inklusive Freddi Fish och Putt Putt-spelen) med flera. Du kan se en fullständig lista med delaljer om vilka äventyr som stöds och hur väl de fungerar på kompatibilitetssidan. ScummVM förbättras konstant, så håll ett öga på listan.
-Bland systemen du kan använda för att spela dessa spel räknas vanliga persondatorer (Windows, Linux, Mac OS X, ...) spelkonsoler (Dreamcast, Nintendo DS & Wii, PSP, ...), smartphones (Android, iPhone, Symbian ...) med flera.
+Bland systemen du kan använda för att spela dessa spel räknas vanliga persondatorer (Windows, Linux, macOS, ...) spelkonsoler (Dreamcast, Nintendo DS & Wii, PSP, ...), smartphones (Android, iPhone, Symbian ...) med flera.
Just nu är ScummVM fortfarande under utveckling. Var medveten om att trots att vi försöker se till att många spel kan avklaras utan att stöta på allvarliga buggar finns det ändå risk för krasher, och vi erbjuder inga garantier. Dock har många spel varit stödda av programmet väldigt länge och borde fungera utmärkt i vilken som helst av de senaste stabila versionerna. Du kan få en uppfattning om hur väl varje spel fungerar i ScummVM genom att titta på kompatibilitetssidan. Faktum är att ScummVM används kommersiellt för nyutgåvor av vissa spel på moderna plattformer. Alltså är många företag nöjda med mjukvarans kvalitet och hur väl programmet stöder spelen.
diff --git a/engines/ags/shared/core/platform.h b/engines/ags/shared/core/platform.h
index 3a0c9d49b87..f9a9ec2afd4 100644
--- a/engines/ags/shared/core/platform.h
+++ b/engines/ags/shared/core/platform.h
@@ -106,7 +106,7 @@ namespace AGS3 {
#if defined(__LP64__)
-// LP64 machine, OS X or Linux
+// LP64 machine, macOS or Linux
// int 32bit | long 64bit | long long 64bit | void* 64bit
#define AGS_PLATFORM_64BIT (1)
#elif defined(_WIN64)
@@ -114,7 +114,7 @@ namespace AGS3 {
// int 32bit | long 32bit | long long 64bit | void* 64bit
#define AGS_PLATFORM_64BIT (1)
#else
-// 32-bit machine, Windows or Linux or OS X
+// 32-bit machine, Windows or Linux or macOS
// int 32bit | long 32bit | long long 64bit | void* 32bit
#define AGS_PLATFORM_64BIT (0)
#endif
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 6103ca5c612..ba6796d3db6 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -2033,7 +2033,7 @@ byte getZoneFromPositionRaw(byte *page, int16 x, int16 y, int16 width) {
// Vertical positions outside the 320x200 screen (e.g. in range 200-232)
// are accessed after teleporting Lo'Ann to the future using the pendant
// and walking down the slope and out of the screen (This causes a crash
- // at least on Mac OS X). The original PC version of Future Wars doesn't
+ // at least on macOS). The original PC version of Future Wars doesn't
// clip its coordinates in this function or in checkCollision-function
// according to reverse engineering but instead just happily reads outside
// the 320x200 buffer. Not really knowing how to properly fix this I simply
diff --git a/engines/glk/tads/os_glk.h b/engines/glk/tads/os_glk.h
index 9ace9dfcd0f..d3662ff657e 100644
--- a/engines/glk/tads/os_glk.h
+++ b/engines/glk/tads/os_glk.h
@@ -168,7 +168,7 @@ void os_time_ns(os_time_t *seconds, long *nanoseconds);
* list of time zone names that can be mapped to zoneinfo names via a
* hand-coded list (such a list is maintained in the Unicode CLDR; our
* Windows implementation uses the CLDR list to generate the mapping).
- * MacOS X uses zoneinfo keys directly; /etc/localtime is a link to the
+ * macOS uses zoneinfo keys directly; /etc/localtime is a link to the
* zoneinfo file for the local zone as set via the system preferences.
*
* os_tzset() must be invoked at some point before this routine is called.
@@ -694,7 +694,7 @@ long os_get_sys_clock_ms();
* file types are meaningful then maps our abstract type IDs to the
* corresponding port-specific type IDs. In practice, this has never been
* used anywhere other than the old Mac OS ports; in fact, it's not even
- * used in the modern Mac OS (OS X and later), since Apple decided to stop
+ * used in the modern macOS since Apple decided to stop
* fighting the tide and start using filename suffixes for this sort of
* tagging, like everyone else always has.
*
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 4ba45cea55e..e4bbc1388d2 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -929,7 +929,7 @@ Common::String MohawkEngine_LivingBooks::convertMacFileName(const Common::String
if (string[i] == ':') // Directory separator
filename += '/';
else if (string[i] == '/') // Literal slash
- filename += ':'; // Replace by colon, as used by Mac OS X for slash
+ filename += ':'; // Replace by colon, as used by macOS for slash
else
filename += string[i];
}
diff --git a/engines/pegasus/movie.cpp b/engines/pegasus/movie.cpp
index 6a1c9500a95..4ed21e6e6f5 100644
--- a/engines/pegasus/movie.cpp
+++ b/engines/pegasus/movie.cpp
@@ -59,7 +59,7 @@ void Movie::initFromMovieFile(const Common::String &fileName, bool transparent)
releaseMovie();
_video = new Video::QuickTimeDecoder();
if (!_video->loadFile(fileName)) {
- // Replace any colon with an underscore, since only Mac OS X
+ // Replace any colon with an underscore, since only macOS
// supports that. See PegasusEngine::detectOpeningClosingDirectory()
// for more info.
Common::String newName(fileName);
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 09eec1658c5..6998e6a88ab 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -152,7 +152,7 @@ Common::Error PegasusEngine::run() {
if (!isDemo() && !detectOpeningClosingDirectory()) {
Common::String message = "Missing intro directory. ";
- // Give Mac OS X a more specific message because we can
+ // Give macOS a more specific message because we can
#ifdef MACOSX
message += "Make sure \"Opening/Closing\" is present.";
#else
@@ -218,7 +218,7 @@ bool PegasusEngine::canSaveGameStateCurrently() {
bool PegasusEngine::detectOpeningClosingDirectory() {
// We need to detect what our Opening/Closing directory is listed as
// On the original disc, it was 'Opening/Closing' but only HFS(+) supports the slash
- // Mac OS X will display this as 'Opening:Closing' and we can use that directly
+ // macOS will display this as 'Opening:Closing' and we can use that directly
// On other systems, users will need to rename to "Opening_Closing"
Common::FSNode gameDataDir(ConfMan.get("path"));
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index c050f28c895..71d4294b99c 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1129,7 +1129,7 @@ Common::Error ScummEngine::init() {
#ifdef ENABLE_SCUMM_7_8
#ifdef MACOSX
if (_game.version == 8 && !memcmp(gameDataDir.getPath().c_str(), "/Volumes/MONKEY3_", 17)) {
- // Special case for COMI on Mac OS X. The mount points on OS X depend
+ // Special case for COMI on macOS. The mount points on macOS depend
// on the volume name. Hence if playing from CD, we'd get a problem.
// So if loading of a resource file fails, we fall back to the (fixed)
// CD mount points (/Volumes/MONKEY3_1 and /Volumes/MONKEY3_2).
diff --git a/graphics/opengl/system_headers.h b/graphics/opengl/system_headers.h
index fad097eb1f8..7b6c2e3b6dd 100644
--- a/graphics/opengl/system_headers.h
+++ b/graphics/opengl/system_headers.h
@@ -24,14 +24,14 @@
#include "common/scummsys.h"
-// On OS X we only support GL contexts. The reason is that Apple's GL interface
+// On macOS we only support GL contexts. The reason is that Apple's GL interface
// uses "void *" for GLhandleARB which is not type compatible with GLint. This
// kills our aliasing trick for extension functions and thus would force us to
// supply two different Shader class implementations or introduce other
-// wrappers. OS X only supports GL contexts right now anyway (at least
+// wrappers. macOS only supports GL contexts right now anyway (at least
// according to SDL2 sources), thus it is not much of an issue.
#if defined(MACOSX) && (!defined(USE_GLES_MODE) || USE_GLES_MODE != 0)
-//#warning "Only forced OpenGL mode is supported on Mac OS X. Overriding settings."
+//#warning "Only forced OpenGL mode is supported on macOS. Overriding settings."
#undef USE_GLES_MODE
#define USE_GLES_MODE 0
#endif
diff --git a/gui/credits.h b/gui/credits.h
index e582ad30b59..0db01c08fcf 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -744,7 +744,7 @@ static const char *credits[] = {
"C0""Cpasjuste",
"C0""rsn8887",
"",
-"C1""SDL (Win/Linux/OS X/etc.)",
+"C1""SDL (Win/Linux/macOS/etc.)",
"C0""Max Horn",
"C2""(retired)",
"C0""Eugene Sandulenko",
diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index 197c4279fad..8591911c9cf 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -221,7 +221,7 @@ bool EditableWidget::handleKeyDown(Common::KeyState state) {
// Let ctrl-a / ctrl-e move the caret to the start / end of the line.
//
// These shortcuts go back a long time for command line programs. As
- // for edit fields in GUIs, they are supported natively on Mac OS X,
+ // for edit fields in GUIs, they are supported natively on macOS,
// which is why I enabled these shortcuts there.
// On other systems (Windows, Gnome), Ctrl-A by default means
// "select all", which is why I didn't enable the shortcuts there
diff --git a/image/pict.cpp b/image/pict.cpp
index b89359dc529..97942247ddd 100644
--- a/image/pict.cpp
+++ b/image/pict.cpp
@@ -405,7 +405,7 @@ void PICTDecoder::unpackBitsRect(Common::SeekableReadStream &stream, bool withPa
case 4:
// We have a planar 32-bit surface
// Note that we ignore the alpha channel since it seems to not be correct
- // Mac OS X does not ignore it, but then displays it incorrectly. Photoshop
+ // macOS does not ignore it, but then displays it incorrectly. Photoshop
// does ignore it and displays it correctly.
_outputSurface->create(width, height, Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0));
for (uint16 y = 0; y < _outputSurface->h; y++) {
diff --git a/ports.mk b/ports.mk
index 039bf93bc89..c4682cdbd30 100644
--- a/ports.mk
+++ b/ports.mk
@@ -79,7 +79,7 @@ ifeq ($(DYNAMIC_MODULES),1)
@for i in $(PLUGINS); do cp $$i ./dist-generic/scummvm; done
endif
-# Special target to create a application wrapper for Mac OS X
+# Special target to create a application wrapper for macOS
ifdef USE_DOCKTILEPLUGIN
@@ -462,7 +462,7 @@ OSX_STATIC_LIBS += -framework Sparkle -Wl,-rpath, at loader_path/../Frameworks
endif
endif
-# Special target to create a static linked binary for Mac OS X.
+# Special target to create a static linked binary for macOS.
# We use -force_cpusubtype_ALL to ensure the binary runs on every
# PowerPC machine.
scummvm-static: $(DETECT_OBJS) $(OBJS)
@@ -479,7 +479,7 @@ iphone: $(DETECT_OBJS) $(OBJS)
-framework CoreFoundation -framework QuartzCore -framework Foundation \
-framework AudioToolbox -framework CoreAudio -framework SystemConfiguration -lobjc -lz
-# Special target to create a snapshot disk image for Mac OS X
+# Special target to create a snapshot disk image for macOS
# TODO: Replace AUTHORS by Credits.rtf
osxsnap: bundle
mkdir ScummVM-snapshot
More information about the Scummvm-git-logs
mailing list