From f9eae2025f1dd1d28f709c136e87f902359f3870 Mon Sep 17 00:00:00 2001 From: kanjitalk755 Date: Fri, 6 Mar 2020 19:10:01 +0900 Subject: [PATCH] SS: Added etherhelper (Xcode only) --- .../project.pbxproj | 42 +++++++++++++++++++ SheepShaver/src/MacOSX/etherhelpertool.c | 1 + SheepShaver/src/MacOSX/runtool.c | 1 + 3 files changed, 44 insertions(+) create mode 120000 SheepShaver/src/MacOSX/etherhelpertool.c create mode 120000 SheepShaver/src/MacOSX/runtool.c diff --git a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj index 6aeaf02f..2d6bc2d6 100755 --- a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj +++ b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj @@ -84,6 +84,9 @@ E413A40320CF7E6D00FBE967 /* video_sdl2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E413A40220CF7E6D00FBE967 /* video_sdl2.cpp */; }; E4150D1220D557820077C51A /* SDL2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E4150D1120D557820077C51A /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E41936C420CFE64D003A7654 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = E41936C320CFE64D003A7654 /* SDLMain.m */; }; + E4202603241250EE000508DF /* runtool.c in Sources */ = {isa = PBXBuildFile; fileRef = E4202602241250EE000508DF /* runtool.c */; }; + E420260524125182000508DF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E420260424125182000508DF /* Security.framework */; }; + E420260B24125442000508DF /* etherhelpertool in Resources */ = {isa = PBXBuildFile; fileRef = E420260A2412540D000508DF /* etherhelpertool */; }; E420910120D0C4FA0094654F /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E420910020D0C4FA0094654F /* SDL2.framework */; }; E444DC1520C8F06700DD29C9 /* pict.c in Sources */ = {isa = PBXBuildFile; fileRef = E444DC1420C8F06700DD29C9 /* pict.c */; }; E44C460520D262B0000583AE /* tftp.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45DC20D262AD000583AE /* tftp.c */; }; @@ -329,6 +332,10 @@ E4150D1120D557820077C51A /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = ""; }; E41936C220CFE64D003A7654 /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLMain.h; path = ../../../BasiliskII/src/SDL/SDLMain.h; sourceTree = ""; }; E41936C320CFE64D003A7654 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = ../../../BasiliskII/src/SDL/SDLMain.m; sourceTree = ""; }; + E4202600241250E2000508DF /* etherhelpertool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = etherhelpertool.c; sourceTree = ""; }; + E4202602241250EE000508DF /* runtool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = runtool.c; sourceTree = ""; }; + E420260424125182000508DF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + E420260A2412540D000508DF /* etherhelpertool */ = {isa = PBXFileReference; lastKnownFileType = text; path = etherhelpertool; sourceTree = BUILT_PRODUCTS_DIR; }; E420910020D0C4FA0094654F /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = ""; }; E4302EE21FBFE7FA00A5B500 /* lowmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lowmem.c; path = Darwin/lowmem.c; sourceTree = ""; }; E444DC1420C8F06700DD29C9 /* pict.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pict.c; path = ../pict.c; sourceTree = ""; }; @@ -392,6 +399,7 @@ buildActionMask = 2147483647; files = ( E420910120D0C4FA0094654F /* SDL2.framework in Frameworks */, + E420260524125182000508DF /* Security.framework in Frameworks */, 0856D21514A9A6C6000B1711 /* IOKit.framework in Frameworks */, 08CD42DC14B7B85B009CA2A2 /* Cocoa.framework in Frameworks */, 08CD42E814B7B8AA009CA2A2 /* Carbon.framework in Frameworks */, @@ -430,6 +438,7 @@ 0856CCC814A99E30000B1711 /* Sources */, 08CD42DF14B7B865009CA2A2 /* Frameworks */, 0856CCC214A99E1C000B1711 /* Products */, + E420260924125403000508DF /* Generated */, ); sourceTree = ""; }; @@ -706,6 +715,8 @@ 0856CE0614A99EEF000B1711 /* MacOSX */ = { isa = PBXGroup; children = ( + E4202600241250E2000508DF /* etherhelpertool.c */, + E4202602241250EE000508DF /* runtool.c */, 0873A76514ABD151004F12B7 /* config */, 0856D2D614A9A704000B1711 /* Launcher */, E456E2AC20C82B60006C8DC2 /* clip_macosx64.mm */, @@ -862,6 +873,7 @@ 08CD42DF14B7B865009CA2A2 /* Frameworks */ = { isa = PBXGroup; children = ( + E420260424125182000508DF /* Security.framework */, E420910020D0C4FA0094654F /* SDL2.framework */, 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */, 08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */, @@ -870,6 +882,14 @@ name = Frameworks; sourceTree = ""; }; + E420260924125403000508DF /* Generated */ = { + isa = PBXGroup; + children = ( + E420260A2412540D000508DF /* etherhelpertool */, + ); + name = Generated; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -911,6 +931,7 @@ isa = PBXNativeTarget; buildConfigurationList = 0856CCC714A99E1D000B1711 /* Build configuration list for PBXNativeTarget "SheepShaver" */; buildPhases = ( + E4202606241251C6000508DF /* ShellScript */, 0856CCBD14A99E1C000B1711 /* Resources */, 0856CCBE14A99E1C000B1711 /* Sources */, 0856CCBF14A99E1C000B1711 /* Frameworks */, @@ -961,6 +982,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E420260B24125442000508DF /* etherhelpertool in Resources */, E44C460820D262B0000583AE /* VERSION in Resources */, 0856D05914A99EF1000B1711 /* SheepShaver.icns in Resources */, E44C460F20D262B0000583AE /* COPYRIGHT in Resources */, @@ -986,6 +1008,23 @@ shellPath = /bin/sh; shellScript = "sed -i '' 's/@PACKAGE_VERSION@/2.5/g' \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\""; }; + E4202606241251C6000508DF /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cc etherhelpertool.c -framework Security -o $BUILT_PRODUCTS_DIR/etherhelpertool\n"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -1049,6 +1088,7 @@ 0856D06214A99EF1000B1711 /* audio_sdl.cpp in Sources */, 0856D06614A99EF1000B1711 /* serial.cpp in Sources */, E456E2AD20C82B61006C8DC2 /* clip_macosx64.mm in Sources */, + E4202603241250EE000508DF /* runtool.c in Sources */, 0856D07B14A99EF1000B1711 /* sony.cpp in Sources */, 0856D07C14A99EF1000B1711 /* thunks.cpp in Sources */, 0856D07D14A99EF1000B1711 /* timer.cpp in Sources */, @@ -1227,6 +1267,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( + ENABLE_MACOSX_ETHERHELPER, "DATADIR=", HAVE_CONFIG_H, USE_JIT, @@ -1289,6 +1330,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( + ENABLE_MACOSX_ETHERHELPER, "DATADIR=", HAVE_CONFIG_H, USE_JIT, diff --git a/SheepShaver/src/MacOSX/etherhelpertool.c b/SheepShaver/src/MacOSX/etherhelpertool.c new file mode 120000 index 00000000..f8c14003 --- /dev/null +++ b/SheepShaver/src/MacOSX/etherhelpertool.c @@ -0,0 +1 @@ +../../../BasiliskII/src/MacOSX/etherhelpertool.c \ No newline at end of file diff --git a/SheepShaver/src/MacOSX/runtool.c b/SheepShaver/src/MacOSX/runtool.c new file mode 120000 index 00000000..592a2495 --- /dev/null +++ b/SheepShaver/src/MacOSX/runtool.c @@ -0,0 +1 @@ +../../../BasiliskII/src/MacOSX/runtool.c \ No newline at end of file