Commit 933c4d7d authored by Stephen Anthony's avatar Stephen Anthony
Browse files

Mac-related files/folders are now using 'macOS' naming scheme.

parent 6a17467e
......@@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
Release 6.0 for Linux, MacOSX and Windows
Release 6.0 for Linux, macOS and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
......@@ -21,7 +21,7 @@ all of your favourite Atari 2600 games again! Stella was originally
developed for Linux by Bradford W. Mott, however, it has been ported to a
number of other platforms and is currently maintained by Stephen Anthony.
This is the 6.0 release of Stella for Linux, Mac OSX and Windows. The
This is the 6.0 release of Stella for Linux, macOS and Windows. The
distributions currently available are:
* Binaries for Windows XP_SP3(*)/Vista/7/8/10 :
......@@ -32,8 +32,8 @@ distributions currently available are:
(*) Note: Support for Windows XP is problematic on some systems,
and will probably be discontinued in a future release.
* Binary distribution for MacOS X 10.7 and above :
Stella-6.0-macosx.dmg (64-bit Intel)
* Binary distribution for macOS 10.7 and above :
Stella-6.0-macos.dmg (64-bit Intel)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_6.0-1_i386.deb
......
......@@ -131,6 +131,9 @@
* The UNIX builds now use the system-installed PNG and ZLIB libraries
by default.
* The Macintosh builds are now named 'macOS' throughout the codebase to
reflect the new naming from Apple.
* For better compatibility, the Windows 32-bit version does not require
SSE2 anymore.
......
......@@ -716,7 +716,7 @@ case $_host_os in
INCLUDES="$INCLUDES -I$SRC/unix"
;;
darwin)
DEFINES="$DEFINES -DBSPF_UNIX -DOSX_KEYS"
DEFINES="$DEFINES -DBSPF_UNIX -DMACOS_KEYS"
MODULES="$MODULES $SRC/unix"
INCLUDES="$INCLUDES -I$SRC/unix"
;;
......@@ -823,7 +823,7 @@ rm -f stella-conf*
if test "$_host_os" = darwin; then
cat <<EOI
WARNING: plain UNIX-style builds on OSX without XCode have degraded functionality
WARNING: plain UNIX-style builds on macOS without XCode have degraded functionality
and are unsupported. Continue on your own risk...
EOI
fi
......@@ -358,7 +358,7 @@
<p>The Mac version of Stella is designed to work on an Apple Macintosh with
the following:</p>
<ul>
<li>MacOSX 10.7 (Lion) or above</li>
<li>macOS 10.7 or above</li>
<li>64-bit Intel processor</li>
<li>OpenGL capable video card</li>
<li>Xcode 8.0 is required to compile the Stella source code</li>
......@@ -382,7 +382,7 @@
<h3><b><u>Other</u></b></h3>
<p>Stella is extremely portable, and in its lifetime has been ported to almost every
platform where the SDL library exists. It is 32/64-bit and endian clean in Linux/Unix, MacOSX
platform where the SDL library exists. It is 32/64-bit and endian clean in Linux/Unix, macOS
and Windows. The Stella Team is interested in hearing about any problems you may
encounter with diverse operating systems and CPU types.</p>
</blockquote>
......@@ -423,7 +423,7 @@
<p>
<h3><b><u>Macintosh</u></b></h3>
<ul>
<li><b>Binary DMG file</b> (Stella-<i>release</i>-macosx.dmg)
<li><b>Binary DMG file</b> (Stella-<i>release</i>-macos.dmg)
<ul>
<li>Double-click the disk image, open the 'Stella' folder, then copy the
<b>Stella.app</b> package to your 'Applications' folder.</li>
......@@ -632,7 +632,7 @@
<tr>
<th>Function</th>
<th>Key (Standard)</th>
<th>Key (MacOSX)</th>
<th>Key (macOS)</th>
</tr>
<tr>
......@@ -1262,7 +1262,7 @@
<tr>
<th>Function</th>
<th>Key (Standard)</th>
<th>Key (MacOSX)</th>
<th>Key (macOS)</th>
</tr>
<tr>
<td>Disable TV effects</td>
......@@ -1347,7 +1347,7 @@
<tr>
<th>Function</th>
<th>Key (Standard)</th>
<th>Key (MacOSX)</th>
<th>Key (macOS)</th>
</tr>
<tr>
......@@ -1483,7 +1483,7 @@
<tr>
<th>Function</th>
<th>Key (Standard)</th>
<th>Key (MacOSX)</th>
<th>Key (macOS)</th>
</tr>
<tr>
......@@ -3072,8 +3072,8 @@
<p>Note that you must use the entire name of the port as specified by
your operating system. For example, in Windows this would be COM1,
COM2, etc.; Linux and MacOSX tend to use names similar to '/dev/xxxxxx'.
For now, only Linux/UNIX, MacOSX, and Windows are supported.</p>
COM2, etc.; Linux and macOS tend to use names similar to '/dev/xxxxxx'.
For now, only Linux/UNIX, macOS, and Windows are supported.</p>
<p>Support for the EEPROM portion of the AtariVox and SaveKey is currently
emulated. That is, a file will be created on your computer simulating the
......
......@@ -19,7 +19,7 @@
#define FSNODE_FACTORY_HXX
class AbstractFSNode;
#if defined(BSPF_UNIX) || defined(BSPF_MAC_OSX)
#if defined(BSPF_UNIX) || defined(BSPF_MACOS)
#include "FSNodePOSIX.hxx"
#elif defined(BSPF_WINDOWS)
#include "FSNodeWINDOWS.hxx"
......@@ -45,7 +45,7 @@ class FilesystemNodeFactory
switch(type)
{
case SYSTEM:
#if defined(BSPF_UNIX) || defined(BSPF_MAC_OSX)
#if defined(BSPF_UNIX) || defined(BSPF_MACOS)
return make_unique<FilesystemNodePOSIX>(path);
#elif defined(BSPF_WINDOWS)
return make_unique<FilesystemNodeWINDOWS>(path);
......
......@@ -189,12 +189,12 @@ bool FrameBufferSDL2::setVideoMode(const string& title, const VideoMode& mode)
: SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex);
uInt32 flags = mode.fsIndex != -1 ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0;
// OSX seems to have issues with destroying the window, and wants to keep
// the same handle
// macOS seems to have issues with destroying the window, and wants to
// keep the same handle
// Problem is, doing so on other platforms results in flickering when
// toggling fullscreen windowed mode
// So we have a special case for OSX
#ifndef BSPF_MAC_OSX
// So we have a special case for macOS
#ifndef BSPF_MACOS
// Don't re-create the window if its size hasn't changed, as it's not
// necessary, and causes flashing in fullscreen mode
if(myWindow)
......@@ -213,7 +213,7 @@ bool FrameBufferSDL2::setVideoMode(const string& title, const VideoMode& mode)
SDL_SetWindowTitle(myWindow, title.c_str());
}
#else
// OSX wants to *never* re-create the window
// macOS wants to *never* re-create the window
// This sometimes results in the window being resized *after* it's displayed,
// but at least the code works and doesn't crash
if(myWindow)
......@@ -346,7 +346,7 @@ void FrameBufferSDL2::setWindowIcon()
{
ASSERT_MAIN_THREAD;
#ifndef BSPF_MAC_OSX // Currently not needed for OSX
#ifndef BSPF_MACOS // Currently not needed for macOS
#include "stella_icon.hxx" // The Stella icon
SDL_Surface* surface = SDL_CreateRGBSurfaceFrom(stella_icon, 32, 32, 32,
......
......@@ -32,10 +32,10 @@
#include "SerialPortWINDOWS.hxx"
#include "SettingsWINDOWS.hxx"
#include "OSystemWINDOWS.hxx"
#elif defined(BSPF_MAC_OSX)
#include "SerialPortMACOSX.hxx"
#include "SettingsMACOSX.hxx"
#include "OSystemMACOSX.hxx"
#elif defined(BSPF_MACOS)
#include "SerialPortMACOS.hxx"
#include "SettingsMACOS.hxx"
#include "OSystemMACOS.hxx"
extern "C" {
int stellaMain(int argc, char* argv[]);
}
......@@ -73,8 +73,8 @@ class MediaFactory
return make_unique<OSystemUNIX>();
#elif defined(BSPF_WINDOWS)
return make_unique<OSystemWINDOWS>();
#elif defined(BSPF_MAC_OSX)
return make_unique<OSystemMACOSX>();
#elif defined(BSPF_MACOS)
return make_unique<OSystemMACOS>();
#else
#error Unsupported platform for OSystem!
#endif
......@@ -86,8 +86,8 @@ class MediaFactory
return make_unique<SettingsUNIX>(osystem);
#elif defined(BSPF_WINDOWS)
return make_unique<SettingsWINDOWS>(osystem);
#elif defined(BSPF_MAC_OSX)
return make_unique<SettingsMACOSX>(osystem);
#elif defined(BSPF_MACOS)
return make_unique<SettingsMACOS>(osystem);
#else
#error Unsupported platform for Settings!
#endif
......@@ -99,8 +99,8 @@ class MediaFactory
return make_unique<SerialPortUNIX>();
#elif defined(BSPF_WINDOWS)
return make_unique<SerialPortWINDOWS>();
#elif defined(BSPF_MAC_OSX)
return make_unique<SerialPortMACOSX>();
#elif defined(BSPF_MACOS)
return make_unique<SerialPortMACOS>();
#else
return make_unique<SerialPort>();
#endif
......
......@@ -259,7 +259,7 @@ void PhysicalKeyboardHandler::handleEvent(StellaKey key, StellaMod mod, bool sta
// Control or Alt/Cmd combos first
if(StellaModTest::isAlt(mod) && state)
{
#ifdef BSPF_MAC_OSX
#ifdef BSPF_MACOS
// These keys work in all states
if(key == KBDK_Q)
{
......
......@@ -417,7 +417,7 @@ namespace StellaModTest
{
inline bool isAlt(int mod)
{
#if defined(BSPF_MAC_OSX) || defined(OSX_KEYS)
#if defined(BSPF_MACOS) || defined(MACOS_KEYS)
return (mod & KBDM_GUI);
#else
return (mod & KBDM_ALT);
......
......@@ -90,7 +90,7 @@ static const string EmptyString("");
namespace BSPF
{
// Defines to help with path handling
#if defined(BSPF_UNIX) || defined(BSPF_MAC_OSX)
#if defined(BSPF_UNIX) || defined(BSPF_MACOS)
static const string PATH_SEPARATOR = "/";
#define ATTRIBUTE_FMT_PRINTF __attribute__((__format__ (__printf__, 2, 0)))
#elif defined(BSPF_WINDOWS)
......
......@@ -44,7 +44,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#if defined(BSPF_MAC_OSX)
#if defined(BSPF_MACOS)
int stellaMain(int argc, char* argv[])
#else
int main(int argc, char* argv[])
......
......@@ -700,7 +700,7 @@ void EventHandler::setActionMappings(EventMode mode)
// There are some keys which are hardcoded. These should be represented too.
string prepend = "";
if(event == Event::Quit)
#ifndef BSPF_MAC_OSX
#ifndef BSPF_MACOS
prepend = "Ctrl Q";
#else
prepend = "Cmd Q";
......
......@@ -67,7 +67,7 @@ Serializer::Serializer()
{
myStream = make_unique<stringstream>(ios::in | ios::out | ios::binary);
// For some reason, Windows and possibly OSX needs to store something in
// For some reason, Windows and possibly macOS needs to store something in
// the stream before it is used for the first time
if(myStream)
{
......
......@@ -118,7 +118,7 @@ void AboutDialog::updateStrings(int page, int lines, string& title)
title = "The Stella Team";
ADD_ATEXT("\\L\\c0""Stephen Anthony");
ADD_ATEXT("\\L\\c2"" Lead developer, current maintainer for the");
ADD_ATEXT("\\L\\c2"" Linux/OSX and Windows ports ");
ADD_ATEXT("\\L\\c2"" Linux, macOS and Windows ports ");
ADD_ATEXT("\\L\\c0""Christian Speckner");
ADD_ATEXT("\\L\\c2"" Emulation core development, TIA core");
ADD_ATEXT("\\L\\c0""Eckhard Stolberg");
......
......@@ -82,7 +82,7 @@ BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font,
buttonWidth, buttonHeight, "Base Dir", kBaseDirCmd);
addFocusWidget(_basedirButton);
#ifndef BSPF_MAC_OSX
#ifndef BSPF_MACOS
b = new ButtonWidget(this, font, _w - 2 * (buttonWidth + 7), _h - buttonHeight - 10,
buttonWidth, buttonHeight, "Choose", kChooseCmd);
addFocusWidget(b);
......
......@@ -727,7 +727,7 @@ void Dialog::addOKCancelBGroup(WidgetArray& wid, const GUI::Font& font,
_w = std::max(HBORDER * 2 + buttonWidth * 2 + BUTTON_GAP, _w);
#ifndef BSPF_MAC_OSX
#ifndef BSPF_MACOS
addOKWidget(new ButtonWidget(this, font, _w - 2 * buttonWidth - HBORDER - BUTTON_GAP,
_h - buttonHeight - VBORDER, buttonWidth, buttonHeight, okText, GuiObject::kOKCmd));
addCancelWidget(new ButtonWidget(this, font, _w - (buttonWidth + HBORDER),
......
......@@ -84,7 +84,7 @@ HelpDialog::HelpDialog(OSystem& osystem, DialogContainer& parent,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
{
#ifdef BSPF_MAC_OSX
#ifdef BSPF_MACOS
#define ALT_ "Cmd"
#else
#define ALT_ "Alt"
......@@ -102,7 +102,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
{
case 1:
title = "Common commands";
#ifndef BSPF_MAC_OSX
#ifndef BSPF_MACOS
ADD_BIND("Ctrl Q", "Quit emulation");
#else
ADD_BIND("Cmd Q", "Quit emulation");
......
......@@ -131,7 +131,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
// Add four buttons at the bottom
xpos = 10; ypos += myDir->getHeight() + 8;
#ifndef BSPF_MAC_OSX
#ifndef BSPF_MACOS
myStartButton = new ButtonWidget(this, font, xpos, ypos, (bwidth + 0) / 4, bheight,
"Select", kLoadROMCmd);
wid.push_back(myStartButton);
......
......@@ -18,8 +18,8 @@
#import <Cocoa/Cocoa.h>
/**
AboutBox window class and support functions for the Macintosh OS X
SDL port of Stella.
AboutBox window class and support functions for the macOS
SDL2 port of Stella.
@author Mark Grebe <atarimac@cox.net>
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment