From dbffd5cebb26719e3573eb1b842d3ed17041d7fe Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sat, 1 Jun 2024 00:10:47 +0200 Subject: [PATCH 1/7] Add W(T)F8 to XCode build. --- src/os/macos/stella.xcodeproj/project.pbxproj | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/os/macos/stella.xcodeproj/project.pbxproj b/src/os/macos/stella.xcodeproj/project.pbxproj index f343f8aa0..55d7d3d92 100644 --- a/src/os/macos/stella.xcodeproj/project.pbxproj +++ b/src/os/macos/stella.xcodeproj/project.pbxproj @@ -759,6 +759,10 @@ E06508BF2272447200B341AC /* KeyValueRepository.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E06508B92272447200B341AC /* KeyValueRepository.hxx */; }; E06508C02272447200B341AC /* KeyValueRepositoryConfigfile.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E06508BA2272447200B341AC /* KeyValueRepositoryConfigfile.hxx */; }; E06508C12272447200B341AC /* KeyValueRepositoryConfigfile.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E06508BB2272447200B341AC /* KeyValueRepositoryConfigfile.cxx */; }; + E07DF4432C0A819D00E1FB07 /* CartWF8.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E07DF4412C0A819D00E1FB07 /* CartWF8.hxx */; }; + E07DF4442C0A819D00E1FB07 /* CartWF8.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E07DF4422C0A819D00E1FB07 /* CartWF8.cxx */; }; + E07DF4472C0A81ED00E1FB07 /* CartWF8Widget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E07DF4452C0A81ED00E1FB07 /* CartWF8Widget.hxx */; }; + E07DF4482C0A81ED00E1FB07 /* CartWF8Widget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E07DF4462C0A81ED00E1FB07 /* CartWF8Widget.cxx */; }; E0893AF2211B9842008B170D /* HighPass.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0893AF0211B9841008B170D /* HighPass.cxx */; }; E0893AF3211B9842008B170D /* HighPass.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E0893AF1211B9841008B170D /* HighPass.hxx */; }; E08B1C18231FF97B00EEF922 /* BreakpointMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E08B1C16231FF97B00EEF922 /* BreakpointMap.cxx */; }; @@ -1613,6 +1617,10 @@ E06508BA2272447200B341AC /* KeyValueRepositoryConfigfile.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = KeyValueRepositoryConfigfile.hxx; sourceTree = ""; }; E06508BB2272447200B341AC /* KeyValueRepositoryConfigfile.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyValueRepositoryConfigfile.cxx; sourceTree = ""; }; E07C2326226393BD00B78631 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + E07DF4412C0A819D00E1FB07 /* CartWF8.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartWF8.hxx; sourceTree = ""; }; + E07DF4422C0A819D00E1FB07 /* CartWF8.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartWF8.cxx; sourceTree = ""; }; + E07DF4452C0A81ED00E1FB07 /* CartWF8Widget.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartWF8Widget.hxx; sourceTree = ""; }; + E07DF4462C0A81ED00E1FB07 /* CartWF8Widget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartWF8Widget.cxx; sourceTree = ""; }; E0893AF0211B9841008B170D /* HighPass.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HighPass.cxx; path = audio/HighPass.cxx; sourceTree = ""; }; E0893AF1211B9841008B170D /* HighPass.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = HighPass.hxx; path = audio/HighPass.hxx; sourceTree = ""; }; E08B1C16231FF97B00EEF922 /* BreakpointMap.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BreakpointMap.cxx; sourceTree = ""; }; @@ -1765,6 +1773,8 @@ 2D20F9E308C603C500A73076 /* gui */ = { isa = PBXGroup; children = ( + E07DF4462C0A81ED00E1FB07 /* CartWF8Widget.cxx */, + E07DF4452C0A81ED00E1FB07 /* CartWF8Widget.hxx */, DC9616221F817830008A2206 /* AmigaMouseWidget.cxx */, DC9616231F817830008A2206 /* AmigaMouseWidget.hxx */, DC9616241F817830008A2206 /* AtariMouseWidget.cxx */, @@ -2054,6 +2064,8 @@ 2D6050CC0898776500C6DE89 /* emucore */ = { isa = PBXGroup; children = ( + E07DF4422C0A819D00E1FB07 /* CartWF8.cxx */, + E07DF4412C0A819D00E1FB07 /* CartWF8.hxx */, DC1B2EBE1E50036100F62837 /* AmigaMouse.hxx */, DC1B2EC01E50036100F62837 /* AtariMouse.hxx */, DC487FB40DA5350900E12499 /* AtariVox.cxx */, @@ -2748,6 +2760,7 @@ 2D9173CB09BA90380026E9FF /* SDLMain.h in Headers */, E09F4141201E9050004A3391 /* Audio.hxx in Headers */, 2D9173CC09BA90380026E9FF /* Booster.hxx in Headers */, + E07DF4472C0A81ED00E1FB07 /* CartWF8Widget.hxx in Headers */, 2D9173CD09BA90380026E9FF /* Cart.hxx in Headers */, DCDE648023E6638E00EE3EFF /* MessageDialog.hxx in Headers */, 2D9173CE09BA90380026E9FF /* Cart2K.hxx in Headers */, @@ -3063,6 +3076,7 @@ DCCF4B0514BA27EB00814FAB /* KeyboardWidget.hxx in Headers */, E050876F25A1337400E4B62A /* OSystemStandalone.hxx in Headers */, DC5C768F14C26F7C0031EBC7 /* StellaKeys.hxx in Headers */, + E07DF4432C0A819D00E1FB07 /* CartWF8.hxx in Headers */, DC36D2C914CAFAB0007DC821 /* CartFA2.hxx in Headers */, DC56FCDF14CCCC4900A31CC3 /* MouseControl.hxx in Headers */, E08B1C19231FF97B00EEF922 /* BreakpointMap.hxx in Headers */, @@ -3309,6 +3323,7 @@ DC6DC91E205DB879004A5FC3 /* PhysicalJoystick.cxx in Sources */, E08FCD5323A037EB0051F59B /* QisBlitter.cxx in Sources */, DCCE0355225104BF008C246F /* StellaSettingsDialog.cxx in Sources */, + E07DF4442C0A819D00E1FB07 /* CartWF8.cxx in Sources */, DC8685C128AAAF7E00DF21AA /* RomImageWidget.cxx in Sources */, 2D91748A09BA90380026E9FF /* Control.cxx in Sources */, 2D91748C09BA90380026E9FF /* Driving.cxx in Sources */, @@ -3608,6 +3623,7 @@ DC79F81217A88D9E00288B91 /* Base.cxx in Sources */, DCAACAF6188D631500A4D282 /* Cart4KSC.cxx in Sources */, DC9616341F817830008A2206 /* TrakBallWidget.cxx in Sources */, + E07DF4482C0A81ED00E1FB07 /* CartWF8Widget.cxx in Sources */, DCAACAF8188D631500A4D282 /* CartBF.cxx in Sources */, DCAACAFA188D631500A4D282 /* CartBFSC.cxx in Sources */, DCAACAFC188D631500A4D282 /* CartDF.cxx in Sources */, From e480b6fab2f92d1e56fd437b46a58b37505457c7 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 2 Jun 2024 12:18:01 +0200 Subject: [PATCH 2/7] Log clang and gcc (alias?) version in CI / MacOS. --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51b2d11d8..e5cd78c29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,8 @@ jobs: curl https://www.libsdl.org/release/SDL2-2.26.0.tar.gz | tar xzf - mkdir SDL2-2.26.0/build cd SDL2-2.26.0/build + gcc --version + clang++ --version ../configure && make -j3 && sudo make install - name: Build Stella run: | From 8a8a87f2362c40b1b688387b1a173a528bba610b Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 2 Jun 2024 12:18:33 +0200 Subject: [PATCH 3/7] Ups, wrong line. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5cd78c29..6abba11c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,11 +33,11 @@ jobs: curl https://www.libsdl.org/release/SDL2-2.26.0.tar.gz | tar xzf - mkdir SDL2-2.26.0/build cd SDL2-2.26.0/build - gcc --version - clang++ --version ../configure && make -j3 && sudo make install - name: Build Stella run: | + gcc --version + clang++ --version ./configure && make -j3 all windows: From 05fdbf9057f89845e9381fc366a9d54134695152 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 2 Jun 2024 17:30:40 +0200 Subject: [PATCH 4/7] Dump MacOS version, arch. --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6abba11c5..caf1dba7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,8 @@ jobs: run: | gcc --version clang++ --version + sw_vers + arch ./configure && make -j3 all windows: From d5c7ff3559aec16bf34f1ae0e720f345446d865c Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 2 Jun 2024 18:59:38 +0200 Subject: [PATCH 5/7] More logging. --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index caf1dba7a..fa544b3a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,9 @@ jobs: run: | gcc --version clang++ --version + g++ --version + which gcc + which g++ sw_vers arch ./configure && make -j3 all From febf9122f57d23bb22d400a93aca49b488faf440 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 2 Jun 2024 19:21:28 +0200 Subject: [PATCH 6/7] Try to update xcode version. --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa544b3a2..33d83c1f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,9 @@ jobs: name: macOS runs-on: macos-latest steps: + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.4' - name: Check out the repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - name: Install SDL2 From befae165aeeb91c21c54cb2aa50a3e507bd522fe Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 2 Jun 2024 19:27:11 +0200 Subject: [PATCH 7/7] Remove logging code. --- .github/workflows/build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33d83c1f0..2bad594f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,13 +39,6 @@ jobs: ../configure && make -j3 && sudo make install - name: Build Stella run: | - gcc --version - clang++ --version - g++ --version - which gcc - which g++ - sw_vers - arch ./configure && make -j3 all windows: