Skip to content

Commit e1c8e6e

Browse files
committed
MacOS mame now uses the SDL 3 framework
1 parent 2b9b112 commit e1c8e6e

3 files changed

Lines changed: 24 additions & 2 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
dist
22
embedded/mame64
33
embedded/SDL2.framework
4+
embedded/SDL3.framework
45
embedded/Sparkle.framework
56
embedded/Sparkle-*
67
embedded/SDL2-*
8+
embedded/SDL3-*
79
build
810
embedded/mame-data.tgz
911
__pycache__

Ample.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,15 @@
124124
B65D718625E70BD5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; };
125125
B65D718725E70BE5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; };
126126
B66236A924FD9A34006CABD7 /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66236A824FD9A34006CABD7 /* PreferencesWindowController.m */; };
127-
B66236B524FDA527006CABD7 /* SDL2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B66236B224FDA522006CABD7 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
128127
B66236C124FDB7A6006CABD7 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = B66236BF24FDB7A6006CABD7 /* Credits.rtf */; };
129128
B6665C14265A0E3E00254939 /* AutocompleteControl.m in Sources */ = {isa = PBXBuildFile; fileRef = B6665C13265A0E3E00254939 /* AutocompleteControl.m */; };
130129
B6665C15265A0E3E00254939 /* AutocompleteControl.m in Sources */ = {isa = PBXBuildFile; fileRef = B6665C13265A0E3E00254939 /* AutocompleteControl.m */; };
131130
B6665C1C265C639A00254939 /* Autocomplete.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6665C1A265C639900254939 /* Autocomplete.xib */; };
132131
B6665C1D265C639A00254939 /* Autocomplete.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6665C1A265C639900254939 /* Autocomplete.xib */; };
133132
B66D0FE72611386C000902F1 /* SoftwareList.m in Sources */ = {isa = PBXBuildFile; fileRef = B66D0FE62611386B000902F1 /* SoftwareList.m */; };
134133
B66D0FE82611386C000902F1 /* SoftwareList.m in Sources */ = {isa = PBXBuildFile; fileRef = B66D0FE62611386B000902F1 /* SoftwareList.m */; };
134+
B66FA06B2F53BED800669A60 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B66FA0692F53BA8A00669A60 /* SDL3.framework */; };
135+
B66FA06C2F53BED800669A60 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B66FA0692F53BA8A00669A60 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
135136
B67877D22B01732600CFACF2 /* ace100.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6896DEC2B016CD800251FA4 /* ace100.plist */; };
136137
B67877D32B01732600CFACF2 /* ace1000.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6896E322B016CEA00251FA4 /* ace1000.plist */; };
137138
B67877D42B01732600CFACF2 /* agat7.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6896E1B2B016CE500251FA4 /* agat7.plist */; };
@@ -654,7 +655,7 @@
654655
dstPath = "";
655656
dstSubfolderSpec = 10;
656657
files = (
657-
B66236B524FDA527006CABD7 /* SDL2.framework in Embed Frameworks */,
658+
B66FA06C2F53BED800669A60 /* SDL3.framework in Embed Frameworks */,
658659
B635C09B26784A1200B23BFD /* Sparkle.framework in Embed Frameworks */,
659660
);
660661
name = "Embed Frameworks";
@@ -873,6 +874,7 @@
873874
B6665C1B265C639900254939 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Autocomplete.xib; sourceTree = "<group>"; };
874875
B66D0FE62611386B000902F1 /* SoftwareList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SoftwareList.m; sourceTree = "<group>"; };
875876
B66D0FE926113AA8000902F1 /* SoftwareList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SoftwareList.h; sourceTree = "<group>"; };
877+
B66FA0692F53BA8A00669A60 /* SDL3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL3.framework; path = embedded/SDL3.framework; sourceTree = "<group>"; };
876878
B67879002B0195C100CFACF2 /* nws1580.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = nws1580.plist; sourceTree = "<group>"; };
877879
B67879012B0195C100CFACF2 /* nws5000x.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = nws5000x.plist; sourceTree = "<group>"; };
878880
B67879062B0195D800CFACF2 /* sun3_50.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = sun3_50.plist; sourceTree = "<group>"; };
@@ -1140,6 +1142,7 @@
11401142
isa = PBXFrameworksBuildPhase;
11411143
buildActionMask = 2147483647;
11421144
files = (
1145+
B66FA06B2F53BED800669A60 /* SDL3.framework in Frameworks */,
11431146
B65D718625E70BD5008C5F87 /* WebKit.framework in Frameworks */,
11441147
B635C09D26784A4800B23BFD /* Sparkle.framework in Frameworks */,
11451148
B68A899426BF124B00B2C8C6 /* CoreMIDI.framework in Frameworks */,
@@ -1503,6 +1506,7 @@
15031506
B66236B824FDA698006CABD7 /* mame64 */,
15041507
B635C09C26784A4800B23BFD /* Sparkle.framework */,
15051508
B66236B224FDA522006CABD7 /* SDL2.framework */,
1509+
B66FA0692F53BA8A00669A60 /* SDL3.framework */,
15061510
);
15071511
name = "Embedded Content";
15081512
sourceTree = "<group>";

embedded/download-sdl-3.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
#!/bin/sh
3+
VERSION=3.4.2
4+
DMG=SDL3-${VERSION}.dmg
5+
URL=https://www.libsdl.org/release/SDL3-${VERSION}.dmg
6+
FRAMEWORK=SDL3.framework
7+
8+
if [ -e $FRAMEWORK ] ; then exit 0 ; fi
9+
10+
if [ ! -e $DMG ] ; then curl -OL $URL ; fi
11+
12+
hdiutil attach $DMG -noverify -nobrowse -mountpoint /Volumes/sdl_disk_image
13+
14+
ditto /Volumes/sdl_disk_image/SDL3.xcframework/macos-arm64_x86_64/$FRAMEWORK $FRAMEWORK
15+
hdiutil detach /Volumes/sdl_disk_image
16+

0 commit comments

Comments
 (0)