From 99d81cc58ccdd1d1ce43da87fcfa8139eff0629f Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Thu, 1 Sep 2022 12:19:47 -0230 Subject: [PATCH 1/3] Test commit from my Mac. --- Changes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes.txt b/Changes.txt index a3b8bc67f..7383fb052 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,7 +12,7 @@ Release History =========================================================================== -6.7 to 7.0 (XXXX XX, 202X) +6.7 to 7.0 (XXXXX XX, 202X) * Enhanced ROM launcher to allow multiple images per ROM (TODO: controller support, doc) From c8b3bd8ba0360674726d6b57fb8c6dee8217929e Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Thu, 1 Sep 2022 12:52:03 -0230 Subject: [PATCH 2/3] First pass at fixing Xcode project. --- src/os/macos/stella.xcodeproj/project.pbxproj | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/os/macos/stella.xcodeproj/project.pbxproj b/src/os/macos/stella.xcodeproj/project.pbxproj index 138f8c92e..0c9c718a1 100644 --- a/src/os/macos/stella.xcodeproj/project.pbxproj +++ b/src/os/macos/stella.xcodeproj/project.pbxproj @@ -852,7 +852,7 @@ 2D05FF5F096E269100A518FE /* EventMappingWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = EventMappingWidget.hxx; sourceTree = ""; }; 2D05FF60096E269100A518FE /* InputDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = InputDialog.cxx; sourceTree = ""; }; 2D05FF61096E269100A518FE /* InputDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = InputDialog.hxx; sourceTree = ""; }; - 2D113E090672BF2100317017 /* docs */ = {isa = PBXFileReference; explicitFileType = folder; name = docs; path = ../../docs; sourceTree = ""; }; + 2D113E090672BF2100317017 /* docs */ = {isa = PBXFileReference; explicitFileType = folder; name = docs; path = ../../../docs; sourceTree = ""; }; 2D16A8E106324136005DF364 /* Stella.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Stella.icns; sourceTree = SOURCE_ROOT; }; 2D17D98E08BC398400E47F69 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; 2D1A6CD4085135F9007CDBA8 /* AboutBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AboutBox.h; sourceTree = SOURCE_ROOT; }; @@ -1692,6 +1692,7 @@ 2D6050CC0898776500C6DE89 /* emucore */, 2D6050FA0898786C00C6DE89 /* gui */, DC816CF32572F8B400FBCCDA /* json */, + DCED2B5F28C1052300243559 /* lib */, DCD6FC5A11C281A1005DA767 /* libpng */, 2D6050C60898771C00C6DE89 /* macos */, E0A383F72589730A0062AA93 /* sqlite */, @@ -1983,7 +1984,8 @@ DCE395ED16CB0B5F008DB1E5 /* ZipHandler.cxx */, DCE395EE16CB0B5F008DB1E5 /* ZipHandler.hxx */, ); - path = common; + name = common; + path = ../common; sourceTree = ""; }; 2D6050C60898771C00C6DE89 /* macos */ = { @@ -2215,7 +2217,8 @@ DC2AADAD194F389C0026C7A4 /* TIASurface.hxx */, DC1B2EC21E50036100F62837 /* TrakBall.hxx */, ); - path = emucore; + name = emucore; + path = ../emucore; sourceTree = ""; }; 2D6050FA0898786C00C6DE89 /* gui */ = { @@ -2358,7 +2361,8 @@ 2DDBEAD4084578BF00812C11 /* Widget.cxx */, 2DDBEAD5084578BF00812C11 /* Widget.hxx */, ); - path = gui; + name = gui; + path = ../gui; sourceTree = ""; }; 2D605130089879BA00C6DE89 /* debugger */ = { @@ -2388,7 +2392,8 @@ 2D6CC10408C811A600B8F642 /* TiaZoomWidget.hxx */, DC2874061F8F2278004BF21A /* TrapArray.hxx */, ); - path = debugger; + name = debugger; + path = ../debugger; sourceTree = ""; }; 2D60513708987A5400C6DE89 /* yacc */ = { @@ -2493,7 +2498,8 @@ DC47455309C34BFA00EDDA3A /* RamCheat.cxx */, DC47455409C34BFA00EDDA3A /* RamCheat.hxx */, ); - path = cheat; + name = cheat; + path = ../cheat; sourceTree = ""; }; DCD6FC5A11C281A1005DA767 /* libpng */ = { @@ -2561,6 +2567,14 @@ path = tia; sourceTree = ""; }; + DCED2B5F28C1052300243559 /* lib */ = { + isa = PBXGroup; + children = ( + ); + name = lib; + path = ../lib; + sourceTree = ""; + }; E06508B72272447200B341AC /* repository */ = { isa = PBXGroup; children = ( From b8812d7b6bbd8e2f8ebf3047d6e0ab132b2116ce Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Thu, 1 Sep 2022 13:05:26 -0230 Subject: [PATCH 3/3] Second pass at fixing Xcode project. --- src/os/macos/stella.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/os/macos/stella.xcodeproj/project.pbxproj b/src/os/macos/stella.xcodeproj/project.pbxproj index 0c9c718a1..09ef01e2e 100644 --- a/src/os/macos/stella.xcodeproj/project.pbxproj +++ b/src/os/macos/stella.xcodeproj/project.pbxproj @@ -1691,14 +1691,10 @@ 2D605130089879BA00C6DE89 /* debugger */, 2D6050CC0898776500C6DE89 /* emucore */, 2D6050FA0898786C00C6DE89 /* gui */, - DC816CF32572F8B400FBCCDA /* json */, DCED2B5F28C1052300243559 /* lib */, - DCD6FC5A11C281A1005DA767 /* libpng */, 2D6050C60898771C00C6DE89 /* macos */, E0A383F72589730A0062AA93 /* sqlite */, 2D6050C90898774B00C6DE89 /* unix */, - 2D60513708987A5400C6DE89 /* yacc */, - DC3EE83B1E2C0E4400905161 /* zlib */, ); name = "Other Sources"; path = ..; @@ -2391,6 +2387,7 @@ 2D6CC10308C811A600B8F642 /* TiaZoomWidget.cxx */, 2D6CC10408C811A600B8F642 /* TiaZoomWidget.hxx */, DC2874061F8F2278004BF21A /* TrapArray.hxx */, + 2D60513708987A5400C6DE89 /* yacc */, ); name = debugger; path = ../debugger; @@ -2570,6 +2567,9 @@ DCED2B5F28C1052300243559 /* lib */ = { isa = PBXGroup; children = ( + DC3EE83B1E2C0E4400905161 /* zlib */, + DCD6FC5A11C281A1005DA767 /* libpng */, + DC816CF32572F8B400FBCCDA /* json */, ); name = lib; path = ../lib;