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

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

parent 6a17467e
......@@ -18,8 +18,8 @@
#import <Cocoa/Cocoa.h>
/**
AboutBoxTextView class and support functions for the Macintosh OS X
SDL port of Stella.
AboutBoxTextView class and support functions for the macOS
SDL2 port of Stella.
@author Mark Grebe <atarimac@cox.net>
*/
......
......@@ -4,7 +4,7 @@
# usage:
# Create_build.sh <version>
#
# The result will be a file called ~/Desktop/Stella-<ver>-macosx.dmg
# The result will be a file called ~/Desktop/Stella-<ver>-macos.dmg
if [ $# != 1 ]; then
echo "usage: Create_build.sh version"
......@@ -12,7 +12,7 @@ if [ $# != 1 ]; then
fi
VER="$1"
DMG="Stella-${VER}-macosx.dmg"
DMG="Stella-${VER}-macos.dmg"
DISK="/Volumes/Stella"
DEST=~/Desktop/${DMG}
......
......@@ -13,7 +13,7 @@ Copyright © 1995-2018 The Stella Team<br>
Stella is now DonationWare!<br>
<a href="https://stella-emu.github.io/donations.html">https://stella-emu.github.io/donations.html</a><br>
<br>
Macintosh OS X version:<br>
macOS version:<br>
Copyright © 2007-2018 Stephen Anthony<br>
Copyright © 2005-2006 Mark Grebe<br>
<br></big>
......
/* Localized versions of Info.plist keys */
CFBundleName = "Stella";
CFBundleShortVersionString = "Stella version 5.1";
CFBundleGetInfoString = "Stella version 5.1";
NSHumanReadableCopyright = "Stella MacOS X version by Stephen Anthony and Mark Grebe.";
CFBundleShortVersionString = "Stella version 6.0";
CFBundleGetInfoString = "Stella version 6.0";
NSHumanReadableCopyright = "Stella macOS version by Stephen Anthony and Mark Grebe.";
"Atari 2600 Cartridge File" = "Atari 2600 Cartridge File";
......@@ -16,7 +16,7 @@
//============================================================================
#include "FSNode.hxx"
#include "OSystemMACOSX.hxx"
#include "OSystemMACOS.hxx"
/**
Each derived class is responsible for calling the following methods
......@@ -29,24 +29,24 @@
*/
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OSystemMACOSX::OSystemMACOSX()
OSystemMACOS::OSystemMACOS()
: OSystem()
{
setBaseDir("~/Library/Application Support/Stella/");
// This will be overridden, as OSX uses plist files for settings
// This will be overridden, as macOS uses plist files for settings
setConfigFile("~/Library/Application Support/Stella/stellarc");
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string OSystemMACOSX::defaultSaveDir() const
string OSystemMACOS::defaultSaveDir() const
{
FilesystemNode desktop("~/Desktop/");
return desktop.isDirectory() ? desktop.getShortPath() : "~/";
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string OSystemMACOSX::defaultLoadDir() const
string OSystemMACOS::defaultLoadDir() const
{
return defaultSaveDir();
}
......@@ -15,24 +15,24 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef OSYSTEM_MACOSX_HXX
#define OSYSTEM_MACOSX_HXX
#ifndef OSYSTEM_MACOS_HXX
#define OSYSTEM_MACOS_HXX
#include "OSystem.hxx"
/**
This class defines UNIX-like OS's (MacOS X) system specific settings.
This class defines UNIX-like OS's (macOS) system-specific settings.
@author Mark Grebe
@author Mark Grebe, Stephen Anthony
*/
class OSystemMACOSX : public OSystem
class OSystemMACOS : public OSystem
{
public:
/**
Create a new MACOSX-specific operating system object
Create a new macOS-specific operating system object
*/
OSystemMACOSX();
virtual ~OSystemMACOSX() = default;
OSystemMACOS();
virtual ~OSystemMACOS() = default;
/**
Returns the default paths for loading/saving files.
......@@ -42,10 +42,10 @@ class OSystemMACOSX : public OSystem
private:
// Following constructors and assignment operators not supported
OSystemMACOSX(const OSystemMACOSX&) = delete;
OSystemMACOSX(OSystemMACOSX&&) = delete;
OSystemMACOSX& operator=(const OSystemMACOSX&) = delete;
OSystemMACOSX& operator=(OSystemMACOSX&&) = delete;
OSystemMACOS(const OSystemMACOS&) = delete;
OSystemMACOS(OSystemMACOS&&) = delete;
OSystemMACOS& operator=(const OSystemMACOS&) = delete;
OSystemMACOS& operator=(OSystemMACOS&&) = delete;
};
#endif
......@@ -18,8 +18,8 @@
#import <Cocoa/Cocoa.h>
/**
Preferences class and support functions for the Macintosh OS X
SDL port of Stella.
Preferences class and support functions for the macOS
SDL2 port of Stella.
@author Mark Grebe <atarimac@cox.net>
*/
......
......@@ -25,23 +25,23 @@
#include <sys/filio.h>
#include <sys/ioctl.h>
#include "SerialPortMACOSX.hxx"
#include "SerialPortMACOS.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SerialPortMACOSX::SerialPortMACOSX()
SerialPortMACOS::SerialPortMACOS()
: SerialPort(),
myHandle(0)
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SerialPortMACOSX::~SerialPortMACOSX()
SerialPortMACOS::~SerialPortMACOS()
{
closePort();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortMACOSX::openPort(const string& device)
bool SerialPortMACOS::openPort(const string& device)
{
myHandle = open(device.c_str(), O_RDWR | O_NOCTTY | O_NONBLOCK);
if(myHandle <= 0)
......@@ -61,7 +61,7 @@ bool SerialPortMACOSX::openPort(const string& device)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SerialPortMACOSX::closePort()
void SerialPortMACOS::closePort()
{
if(myHandle)
{
......@@ -71,11 +71,11 @@ void SerialPortMACOSX::closePort()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortMACOSX::writeByte(const uInt8* data)
bool SerialPortMACOS::writeByte(const uInt8* data)
{
if(myHandle)
{
// cerr << "SerialPortMACOSX::writeByte " << (int)(*data) << endl;
// cerr << "SerialPortMACOS::writeByte " << (int)(*data) << endl;
return write(myHandle, data, 1) == 1;
}
return false;
......
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