Skip to content

GitLab

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

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

parent 6a17467e
Hide whitespace changes
Inline Side-by-side
src/macosx/SerialPortMACOSX.hxx → src/macos/SerialPortMACOS.hxx
View file @ 933c4d7d
......@@ -15,22 +15,22 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef SERIALPORT_UNIX_HXX
#define SERIALPORT_UNIX_HXX
#ifndef SERIALPORT_MACOS_HXX
#define SERIALPORT_MACOS_HXX
#include "SerialPort.hxx"
/**
Implement reading and writing from a serial port under OSX. For now,
Implement reading and writing from a serial port under macOS. For now,
reading isn't actually supported at all.
@author Stephen Anthony & D. Spice
*/
class SerialPortMACOSX : public SerialPort
class SerialPortMACOS : public SerialPort
{
public:
SerialPortMACOSX();
virtual ~SerialPortMACOSX();
SerialPortMACOS();
virtual ~SerialPortMACOS();
/**
Open the given serial port with the specified attributes.
......@@ -59,10 +59,10 @@ class SerialPortMACOSX : public SerialPort
private:
// Following constructors and assignment operators not supported
SerialPortMACOSX(const SerialPortMACOSX&) = delete;
SerialPortMACOSX(SerialPortMACOSX&&) = delete;
SerialPortMACOSX& operator=(const SerialPortMACOSX&) = delete;
SerialPortMACOSX& operator=(SerialPortMACOSX&&) = delete;
SerialPortMACOS(const SerialPortMACOS&) = delete;
SerialPortMACOS(SerialPortMACOS&&) = delete;
SerialPortMACOS& operator=(const SerialPortMACOS&) = delete;
SerialPortMACOS& operator=(SerialPortMACOS&&) = delete;
};
#endif
src/macosx/SettingsMACOSX.cxx → src/macos/SettingsMACOS.cxx
View file @ 933c4d7d
......@@ -15,7 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include "SettingsMACOSX.hxx"
#include "SettingsMACOS.hxx"
extern "C" {
void prefsSetString(const char* key, const char* value);
......@@ -24,13 +24,13 @@ extern "C" {
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingsMACOSX::SettingsMACOSX(OSystem& osystem)
SettingsMACOS::SettingsMACOS(OSystem& osystem)
: Settings(osystem)
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SettingsMACOSX::loadConfig()
void SettingsMACOS::loadConfig()
{
string key, value;
char cvalue[4096];
......@@ -46,7 +46,7 @@ void SettingsMACOSX::loadConfig()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SettingsMACOSX::saveConfig()
void SettingsMACOS::saveConfig()
{
// Write out each of the key and value pairs
for(const auto& s: getInternalSettings())
......
src/macosx/SettingsMACOSX.hxx → src/macos/SettingsMACOS.hxx
View file @ 933c4d7d
......@@ -15,26 +15,26 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef SETTINGS_MAC_OSX_HXX
#define SETTINGS_MAC_OSX_HXX
#ifndef SETTINGS_MACOS_HXX
#define SETTINGS_MACOS_HXX
class OSystem;
#include "Settings.hxx"
/**
This class defines Macintosh OSX system specific settings.
This class defines macOS system-specific settings.
@author Mark Grebe
@author Mark Grebe, Stephen Anthony
*/
class SettingsMACOSX : public Settings
class SettingsMACOS : public Settings
{
public:
/**
Create a new UNIX settings object
*/
explicit SettingsMACOSX(OSystem& osystem);
virtual ~SettingsMACOSX() = default;
explicit SettingsMACOS(OSystem& osystem);
virtual ~SettingsMACOS() = default;
public:
/**
......@@ -51,11 +51,11 @@ class SettingsMACOSX : public Settings
private:
// Following constructors and assignment operators not supported
SettingsMACOSX() = delete;
SettingsMACOSX(const SettingsMACOSX&) = delete;
SettingsMACOSX(SettingsMACOSX&&) = delete;
SettingsMACOSX& operator=(const SettingsMACOSX&) = delete;
SettingsMACOSX& operator=(SettingsMACOSX&&) = delete;
SettingsMACOS() = delete;
SettingsMACOS(const SettingsMACOS&) = delete;
SettingsMACOS(SettingsMACOS&&) = delete;
SettingsMACOS& operator=(const SettingsMACOS&) = delete;
SettingsMACOS& operator=(SettingsMACOS&&) = delete;
};
#endif
src/macosx/stella.xcodeproj/project.pbxproj → src/macos/stella.xcodeproj/project.pbxproj
View file @ 933c4d7d
......@@ -43,8 +43,6 @@
2D9173F909BA90380026E9FF /* EventHandler.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D733D6F062895B2006265D9 /* EventHandler.hxx */; };
2D9173FA09BA90380026E9FF /* FrameBuffer.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D733D71062895B2006265D9 /* FrameBuffer.hxx */; };
2D9173FB09BA90380026E9FF /* Settings.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D733D77062895F1006265D9 /* Settings.hxx */; };
2D9173FC09BA90380026E9FF /* SettingsMACOSX.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D94486C0629124700DD9879 /* SettingsMACOSX.hxx */; };
2D9173FF09BA90380026E9FF /* OSystemMACOSX.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2DDBEA0F0845709700812C11 /* OSystemMACOSX.hxx */; };
2D91740009BA90380026E9FF /* AboutDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2DDBEAA4084578BF00812C11 /* AboutDialog.hxx */; };
2D91740109BA90380026E9FF /* AudioDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2DDBEAA7084578BF00812C11 /* AudioDialog.hxx */; };
2D91740209BA90380026E9FF /* BrowserDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2DDBEAA9084578BF00812C11 /* BrowserDialog.hxx */; };
......@@ -145,9 +143,7 @@
2D9174A109BA90380026E9FF /* EventHandler.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2D733D6E062895B2006265D9 /* EventHandler.cxx */; };
2D9174A209BA90380026E9FF /* FrameBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2D733D70062895B2006265D9 /* FrameBuffer.cxx */; };
2D9174A309BA90380026E9FF /* Settings.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2D944848062904E800DD9879 /* Settings.cxx */; };
2D9174A409BA90380026E9FF /* SettingsMACOSX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2D944866062911CD00DD9879 /* SettingsMACOSX.cxx */; };
2D9174A809BA90380026E9FF /* FSNodePOSIX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2DDBEA0C0845708800812C11 /* FSNodePOSIX.cxx */; };
2D9174A909BA90380026E9FF /* OSystemMACOSX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2DDBEA0E0845709700812C11 /* OSystemMACOSX.cxx */; };
2D9174AA09BA90380026E9FF /* AboutDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2DDBEAA3084578BF00812C11 /* AboutDialog.cxx */; };
2D9174AB09BA90380026E9FF /* AudioDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2DDBEAA6084578BF00812C11 /* AudioDialog.cxx */; };
2D9174AC09BA90380026E9FF /* BrowserDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2DDBEAA8084578BF00812C11 /* BrowserDialog.cxx */; };
......@@ -235,8 +231,12 @@
DC1B2EC81E50036100F62837 /* TrakBall.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC1B2EC21E50036100F62837 /* TrakBall.hxx */; };
DC1BC6662066B4390076F74A /* PKeyboardHandler.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC1BC6642066B4390076F74A /* PKeyboardHandler.cxx */; };
DC1BC6672066B4390076F74A /* PKeyboardHandler.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC1BC6652066B4390076F74A /* PKeyboardHandler.hxx */; };
DC1FC18A0DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */; };
DC1FC18B0DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */; };
DC21E5BF21CA903E007D0E1A /* OSystemMACOS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC21E5B921CA903E007D0E1A /* OSystemMACOS.cxx */; };
DC21E5C021CA903E007D0E1A /* OSystemMACOS.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC21E5BA21CA903E007D0E1A /* OSystemMACOS.hxx */; };
DC21E5C121CA903E007D0E1A /* SerialPortMACOS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC21E5BB21CA903E007D0E1A /* SerialPortMACOS.cxx */; };
DC21E5C221CA903E007D0E1A /* SerialPortMACOS.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC21E5BC21CA903E007D0E1A /* SerialPortMACOS.hxx */; };
DC21E5C321CA903E007D0E1A /* SettingsMACOS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC21E5BD21CA903E007D0E1A /* SettingsMACOS.cxx */; };
DC21E5C421CA903E007D0E1A /* SettingsMACOS.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC21E5BE21CA903E007D0E1A /* SettingsMACOS.hxx */; };
DC2874071F8F2278004BF21A /* TrapArray.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC2874061F8F2278004BF21A /* TrapArray.hxx */; };
DC2AADAE194F389C0026C7A4 /* CartDASH.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC2AADAA194F389C0026C7A4 /* CartDASH.cxx */; };
DC2AADAF194F389C0026C7A4 /* CartDASH.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC2AADAB194F389C0026C7A4 /* CartDASH.hxx */; };
......@@ -785,15 +785,11 @@
2D9217FB0857CC88001D664B /* Font.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Font.cxx; sourceTree = "<group>"; };
2D9217FC0857CC88001D664B /* Font.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Font.hxx; sourceTree = "<group>"; };
2D944848062904E800DD9879 /* Settings.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Settings.cxx; sourceTree = "<group>"; };
2D944866062911CD00DD9879 /* SettingsMACOSX.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsMACOSX.cxx; sourceTree = "<group>"; };
2D94486C0629124700DD9879 /* SettingsMACOSX.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = SettingsMACOSX.hxx; sourceTree = "<group>"; };
2D9555D90880E78000466554 /* Cart3E.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Cart3E.cxx; sourceTree = "<group>"; };
2D9555DA0880E78000466554 /* Cart3E.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Cart3E.hxx; sourceTree = "<group>"; };
2D9555DD0880E79600466554 /* CpuDebug.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CpuDebug.cxx; sourceTree = "<group>"; };
2D9555DE0880E79600466554 /* CpuDebug.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = CpuDebug.hxx; sourceTree = "<group>"; };
2DDBEA0C0845708800812C11 /* FSNodePOSIX.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FSNodePOSIX.cxx; sourceTree = "<group>"; };
2DDBEA0E0845709700812C11 /* OSystemMACOSX.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OSystemMACOSX.cxx; sourceTree = "<group>"; };
2DDBEA0F0845709700812C11 /* OSystemMACOSX.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = OSystemMACOSX.hxx; sourceTree = "<group>"; };
2DDBEAA3084578BF00812C11 /* AboutDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AboutDialog.cxx; sourceTree = "<group>"; };
2DDBEAA4084578BF00812C11 /* AboutDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = AboutDialog.hxx; sourceTree = "<group>"; };
2DDBEAA6084578BF00812C11 /* AudioDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AudioDialog.cxx; sourceTree = "<group>"; };
......@@ -938,8 +934,12 @@
DC1B2EC21E50036100F62837 /* TrakBall.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TrakBall.hxx; sourceTree = "<group>"; };
DC1BC6642066B4390076F74A /* PKeyboardHandler.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PKeyboardHandler.cxx; sourceTree = "<group>"; };
DC1BC6652066B4390076F74A /* PKeyboardHandler.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = PKeyboardHandler.hxx; sourceTree = "<group>"; };
DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SerialPortMACOSX.cxx; sourceTree = "<group>"; };
DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = SerialPortMACOSX.hxx; sourceTree = "<group>"; };
DC21E5B921CA903E007D0E1A /* OSystemMACOS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OSystemMACOS.cxx; sourceTree = SOURCE_ROOT; };
DC21E5BA21CA903E007D0E1A /* OSystemMACOS.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OSystemMACOS.hxx; sourceTree = SOURCE_ROOT; };
DC21E5BB21CA903E007D0E1A /* SerialPortMACOS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SerialPortMACOS.cxx; sourceTree = SOURCE_ROOT; };
DC21E5BC21CA903E007D0E1A /* SerialPortMACOS.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SerialPortMACOS.hxx; sourceTree = SOURCE_ROOT; };
DC21E5BD21CA903E007D0E1A /* SettingsMACOS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsMACOS.cxx; sourceTree = SOURCE_ROOT; };
DC21E5BE21CA903E007D0E1A /* SettingsMACOS.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SettingsMACOS.hxx; sourceTree = SOURCE_ROOT; };
DC2874061F8F2278004BF21A /* TrapArray.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TrapArray.hxx; sourceTree = "<group>"; };
DC2AADAA194F389C0026C7A4 /* CartDASH.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartDASH.cxx; sourceTree = "<group>"; };
DC2AADAB194F389C0026C7A4 /* CartDASH.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartDASH.hxx; sourceTree = "<group>"; };
......@@ -1436,7 +1436,7 @@
2D6050CC0898776500C6DE89 /* emucore */,
2D6050FA0898786C00C6DE89 /* gui */,
DCD6FC5A11C281A1005DA767 /* libpng */,
2D6050C60898771C00C6DE89 /* macosx */,
2D6050C60898771C00C6DE89 /* macos */,
2D6050C90898774B00C6DE89 /* unix */,
2D60513708987A5400C6DE89 /* yacc */,
DC3EE83B1E2C0E4400905161 /* zlib */,
......@@ -1696,16 +1696,17 @@
path = common;
sourceTree = "<group>";
};
2D6050C60898771C00C6DE89 /* macosx */ = {
2D6050C60898771C00C6DE89 /* macos */ = {
isa = PBXGroup;
children = (
2DDBEA0E0845709700812C11 /* OSystemMACOSX.cxx */,
2DDBEA0F0845709700812C11 /* OSystemMACOSX.hxx */,
DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */,
DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */,
2D944866062911CD00DD9879 /* SettingsMACOSX.cxx */,
2D94486C0629124700DD9879 /* SettingsMACOSX.hxx */,
DC21E5B921CA903E007D0E1A /* OSystemMACOS.cxx */,
DC21E5BA21CA903E007D0E1A /* OSystemMACOS.hxx */,
DC21E5BB21CA903E007D0E1A /* SerialPortMACOS.cxx */,
DC21E5BC21CA903E007D0E1A /* SerialPortMACOS.hxx */,
DC21E5BD21CA903E007D0E1A /* SettingsMACOS.cxx */,
DC21E5BE21CA903E007D0E1A /* SettingsMACOS.hxx */,
);
name = macos;
path = macosx;
sourceTree = "<group>";
};
......@@ -2281,8 +2282,6 @@
2D9173F909BA90380026E9FF /* EventHandler.hxx in Headers */,
2D9173FA09BA90380026E9FF /* FrameBuffer.hxx in Headers */,
2D9173FB09BA90380026E9FF /* Settings.hxx in Headers */,
2D9173FC09BA90380026E9FF /* SettingsMACOSX.hxx in Headers */,
2D9173FF09BA90380026E9FF /* OSystemMACOSX.hxx in Headers */,
2D91740009BA90380026E9FF /* AboutDialog.hxx in Headers */,
DCF3A6EE1DFC75E3008A8AF3 /* DelayQueueMember.hxx in Headers */,
DC96162F1F817830008A2206 /* AtariMouseWidget.hxx in Headers */,
......@@ -2363,6 +2362,7 @@
DC2C5EDB1F8F2403007D2A09 /* smartmod.hxx in Headers */,
DCE5CDE41BA10024005CD08A /* RiotRamWidget.hxx in Headers */,
DCF3A6E81DFC75E3008A8AF3 /* Background.hxx in Headers */,
DC21E5C021CA903E007D0E1A /* OSystemMACOS.hxx in Headers */,
DCFB9FAC1ECA2609004FD69B /* DelayQueueIteratorImpl.hxx in Headers */,
DCA078351F8C1B04008EFEE5 /* SDL_lib.hxx in Headers */,
DCDA03B11A2009BB00711920 /* CartWD.hxx in Headers */,
......@@ -2405,7 +2405,6 @@
DC4613680D92C03600D8DAB9 /* RomAuditDialog.hxx in Headers */,
DC487FB70DA5350900E12499 /* AtariVox.hxx in Headers */,
DC11F78E0DB36933003B505E /* MT24LC256.hxx in Headers */,
DC1FC18B0DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx in Headers */,
DCA00FF80DBABCAD00C3823D /* RiotDebug.hxx in Headers */,
DC4AC6F00DC8DACB00CD3AD2 /* RiotWidget.hxx in Headers */,
DC4AC6F40DC8DAEF00CD3AD2 /* SaveKey.hxx in Headers */,
......@@ -2438,6 +2437,7 @@
DC6F394E21B897F300897AD8 /* ThreadDebugging.hxx in Headers */,
DCC527D310B9DA19005E1287 /* M6502.hxx in Headers */,
DC3EE8661E2C0E6D00905161 /* inflate.h in Headers */,
DC21E5C221CA903E007D0E1A /* SerialPortMACOS.hxx in Headers */,
DCC527D510B9DA19005E1287 /* NullDev.hxx in Headers */,
DCC527D710B9DA19005E1287 /* System.hxx in Headers */,
CFE3F6161E84A9CE00A8204E /* CartCDF.hxx in Headers */,
......@@ -2499,6 +2499,7 @@
DCAAE5DC1715887B0080BB82 /* CartCVWidget.hxx in Headers */,
DCAAE5DD1715887B0080BB82 /* CartDebugWidget.hxx in Headers */,
DC6DC921205DB879004A5FC3 /* PJoystickHandler.hxx in Headers */,
DC21E5C421CA903E007D0E1A /* SettingsMACOS.hxx in Headers */,
DCAAE5DF1715887B0080BB82 /* CartEFSCWidget.hxx in Headers */,
DCAAE5E11715887B0080BB82 /* CartEFWidget.hxx in Headers */,
DCDFF08220B781B0001227C0 /* DispatchResult.hxx in Headers */,
......@@ -2711,9 +2712,7 @@
2D9174A109BA90380026E9FF /* EventHandler.cxx in Sources */,
2D9174A209BA90380026E9FF /* FrameBuffer.cxx in Sources */,
2D9174A309BA90380026E9FF /* Settings.cxx in Sources */,
2D9174A409BA90380026E9FF /* SettingsMACOSX.cxx in Sources */,
2D9174A809BA90380026E9FF /* FSNodePOSIX.cxx in Sources */,
2D9174A909BA90380026E9FF /* OSystemMACOSX.cxx in Sources */,
2D9174AA09BA90380026E9FF /* AboutDialog.cxx in Sources */,
2D9174AB09BA90380026E9FF /* AudioDialog.cxx in Sources */,
2D9174AC09BA90380026E9FF /* BrowserDialog.cxx in Sources */,
......@@ -2778,6 +2777,7 @@
DCDFF08120B781B0001227C0 /* DispatchResult.cxx in Sources */,
2D9174FC09BA90380026E9FF /* RamWidget.cxx in Sources */,
DC2AADAE194F389C0026C7A4 /* CartDASH.cxx in Sources */,
DC21E5C121CA903E007D0E1A /* SerialPortMACOS.cxx in Sources */,
E007231F210FBF5E002CF343 /* FpsMeter.cxx in Sources */,
2D9174FD09BA90380026E9FF /* RomListWidget.cxx in Sources */,
DCF3A6F81DFC75E3008A8AF3 /* PaddleReader.cxx in Sources */,
......@@ -2823,7 +2823,6 @@
DC4613670D92C03600D8DAB9 /* RomAuditDialog.cxx in Sources */,
DC487FB60DA5350900E12499 /* AtariVox.cxx in Sources */,
DC11F78D0DB36933003B505E /* MT24LC256.cxx in Sources */,
DC1FC18A0DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx in Sources */,
DCA00FF70DBABCAD00C3823D /* RiotDebug.cxx in Sources */,
DC047FEE1A4A6F3600348F0F /* JoystickDialog.cxx in Sources */,
DC4AC6EF0DC8DACB00CD3AD2 /* RiotWidget.cxx in Sources */,
......@@ -2848,6 +2847,7 @@
DC6B2BA611037FF200F199A7 /* DiStella.cxx in Sources */,
CFE3F6151E84A9CE00A8204E /* CartCDF.cxx in Sources */,
DCA82C711FEB4E780059340F /* TimeMachine.cxx in Sources */,
DC21E5C321CA903E007D0E1A /* SettingsMACOS.cxx in Sources */,
DCD3F7C511340AAF00DBA3AE /* Genesis.cxx in Sources */,
DCAD60A81152F8BD00BC4184 /* CartDPCPlus.cxx in Sources */,
DC5ACB5B1FBFCE8E00A213FD /* DeveloperDialog.cxx in Sources */,
......@@ -2905,6 +2905,7 @@
DCAAE5D71715887B0080BB82 /* Cart4KWidget.cxx in Sources */,
DCDA03B01A2009BB00711920 /* CartWD.cxx in Sources */,
DCC6A4B220A2622500863C59 /* SimpleResampler.cxx in Sources */,
DC21E5BF21CA903E007D0E1A /* OSystemMACOS.cxx in Sources */,
DCAAE5D91715887B0080BB82 /* Cart0840Widget.cxx in Sources */,
DCAAE5DB1715887B0080BB82 /* CartCVWidget.cxx in Sources */,
DCAAE5DE1715887B0080BB82 /* CartEFSCWidget.cxx in Sources */,
......@@ -2996,7 +2997,7 @@
JOYSTICK_SUPPORT,
SOUND_SUPPORT,
WINDOWED_SUPPORT,
BSPF_MAC_OSX,
BSPF_MACOS,
MAC_OSX,
);
HEADER_SEARCH_PATHS = (
......@@ -3047,7 +3048,7 @@
JOYSTICK_SUPPORT,
SOUND_SUPPORT,
WINDOWED_SUPPORT,
BSPF_MAC_OSX,
BSPF_MACOS,
MAC_OSX,
);
HEADER_SEARCH_PATHS = (
......
src/unix/FSNodePOSIX.hxx
View file @ 933c4d7d
......@@ -20,7 +20,7 @@
#include "FSNode.hxx"
#ifdef MACOSX
#ifdef BSPF_MACOS
#include <sys/types.h>
#endif
......@@ -39,7 +39,7 @@
#endif
/*
* Implementation of the Stella file system API based on POSIX (for Linux and OSX)
* Implementation of the Stella file system API based on POSIX (for Linux and macOS)
*
* Parts of this class are documented in the base interface class, AbstractFSNode.
*/
......
src/zlib/zconf.h
View file @ 933c4d7d
......@@ -8,8 +8,8 @@
#ifndef ZCONF_H
#define ZCONF_H
/* Added by SA: 2017-07-09 */
#if defined(BSPF_UNIX) || defined(BSPF_MAC_OSX)
/* Added by SA: 2018-12-18 */
#if defined(BSPF_UNIX) || defined(BSPF_MACOS)
#define HAVE_UNISTD_H
#endif
#define HAVE_STDARG_H
......
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