diff --git a/BasiliskII/src/CrossPlatform/video_blit.cpp b/BasiliskII/src/CrossPlatform/video_blit.cpp index fc8bb451..5f1a0ae3 100755 --- a/BasiliskII/src/CrossPlatform/video_blit.cpp +++ b/BasiliskII/src/CrossPlatform/video_blit.cpp @@ -529,7 +529,7 @@ bool Screen_blitter_init(VisualFormat const & visual_format, bool native_byte_or // Windowed 1-bit mode uses a 1-bit X image, so there's no need for special blitting routines Screen_blit = Blit_Copy_Raw; -#if __MACOSX__ +#if __MACOSX__ && !defined(SHEEPSHAVER) // dludwig@pobox.com, HACK: This works on OSX (64-bit, at least), but not Linux (32-bit?). Why? // To note, __MACOSX__ is an SDL-declared macro (for platform identification at compile time). } else if (mac_depth == 16) { diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj index aec36915..aff6bfe7 100644 --- a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj +++ b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj @@ -7,31 +7,10 @@ objects = { /* Begin PBXBuildFile section */ - 4ECAC2671F8A8A5D0013B963 /* ether_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2661F8A8A5D0013B963 /* ether_unix.cpp */; }; - 4ECAC2681F8A8AE90013B963 /* bootp.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2601F8A8A020013B963 /* bootp.c */; }; - 4ECAC2691F8A8AF10013B963 /* cksum.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2541F8A8A000013B963 /* cksum.c */; }; - 4ECAC26A1F8A8AF80013B963 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC23F1F8A89FE0013B963 /* debug.c */; }; - 4ECAC26B1F8A8B010013B963 /* if.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2501F8A8A000013B963 /* if.c */; }; - 4ECAC26C1F8A8B120013B963 /* ip_icmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2441F8A89FE0013B963 /* ip_icmp.c */; }; - 4ECAC26D1F8A8B120013B963 /* ip_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2481F8A89FF0013B963 /* ip_input.c */; }; - 4ECAC26E1F8A8B120013B963 /* ip_output.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2471F8A89FF0013B963 /* ip_output.c */; }; - 4ECAC26F1F8A8B230013B963 /* mbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC24F1F8A89FF0013B963 /* mbuf.c */; }; - 4ECAC2701F8A8B230013B963 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2401F8A89FE0013B963 /* misc.c */; }; - 4ECAC2711F8A8B350013B963 /* sbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC24A1F8A89FF0013B963 /* sbuf.c */; }; - 4ECAC2721F8A8B390013B963 /* slirp.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC23D1F8A89FE0013B963 /* slirp.c */; }; - 4ECAC2731F8A8B390013B963 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2431F8A89FE0013B963 /* socket.c */; }; - 4ECAC2741F8A8B480013B963 /* tcp_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC25E1F8A8A020013B963 /* tcp_input.c */; }; - 4ECAC2751F8A8B480013B963 /* tcp_output.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC24C1F8A89FF0013B963 /* tcp_output.c */; }; - 4ECAC2761F8A8B480013B963 /* tcp_subr.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2571F8A8A000013B963 /* tcp_subr.c */; }; - 4ECAC2771F8A8B480013B963 /* tcp_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC24D1F8A89FF0013B963 /* tcp_timer.c */; }; - 4ECAC2781F8A8B4B0013B963 /* tftp.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC2521F8A8A000013B963 /* tftp.c */; }; - 4ECAC2791F8A8B530013B963 /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 4ECAC24E1F8A89FF0013B963 /* udp.c */; }; 752F26F91F240E51001032B4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 752F26F81F240E51001032B4 /* Foundation.framework */; }; 752F26FB1F240E69001032B4 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 752F26FA1F240E69001032B4 /* IOKit.framework */; }; 752F27011F242BAF001032B4 /* prefs_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 752F27001F242BAF001032B4 /* prefs_sdl.cpp */; }; 752F27031F242F51001032B4 /* xpram_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 752F27021F242F51001032B4 /* xpram_sdl.cpp */; }; - 752F27141F251B5C001032B4 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 752F270D1F251B4A001032B4 /* SDL2.framework */; }; - 752F27151F251B5C001032B4 /* SDL2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 752F270D1F251B4A001032B4 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 753252E91F535A0C0024025B /* build68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 753252E51F5359040024025B /* build68k.c */; }; 753252EE1F535DD10024025B /* defs68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 753252ED1F535DD10024025B /* defs68k.c */; }; 753253021F535F210024025B /* gencpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 753253011F535F210024025B /* gencpu.c */; }; @@ -42,7 +21,6 @@ 753253331F5368370024025B /* cpustbl_nf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7532532E1F5368370024025B /* cpustbl_nf.cpp */; }; 753253341F5368370024025B /* cpustbl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7532532F1F5368370024025B /* cpustbl.cpp */; }; 753253351F53688D0024025B /* readcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E0CE1F23B25A006B2DF2 /* readcpu.cpp */; }; - 7539DFBF1F23B17E006B2DF2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7539DFBE1F23B17E006B2DF2 /* Assets.xcassets */; }; 7539E1251F23B25A006B2DF2 /* adb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539DFC91F23B25A006B2DF2 /* adb.cpp */; }; 7539E1261F23B25A006B2DF2 /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539DFCA1F23B25A006B2DF2 /* audio.cpp */; }; 7539E1271F23B25A006B2DF2 /* cdrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539DFCB1F23B25A006B2DF2 /* cdrom.cpp */; }; @@ -89,7 +67,6 @@ 7539E2471F23B32A006B2DF2 /* mkstandalone in Resources */ = {isa = PBXBuildFile; fileRef = 7539E1FA1F23B32A006B2DF2 /* mkstandalone */; }; 7539E2491F23B32A006B2DF2 /* testlmem.sh in Resources */ = {isa = PBXBuildFile; fileRef = 7539E1FC1F23B32A006B2DF2 /* testlmem.sh */; }; 7539E24A1F23B32A006B2DF2 /* disk_sparsebundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E1FD1F23B32A006B2DF2 /* disk_sparsebundle.cpp */; }; - 7539E24C1F23B32A006B2DF2 /* extfs_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E2001F23B32A006B2DF2 /* extfs_unix.cpp */; }; 7539E24D1F23B32A006B2DF2 /* fbdevices in Resources */ = {isa = PBXBuildFile; fileRef = 7539E2011F23B32A006B2DF2 /* fbdevices */; }; 7539E2501F23B32A006B2DF2 /* install-sh in Resources */ = {isa = PBXBuildFile; fileRef = 7539E2051F23B32A006B2DF2 /* install-sh */; }; 7539E2541F23B32A006B2DF2 /* keycodes in Resources */ = {isa = PBXBuildFile; fileRef = 7539E20A1F23B32A006B2DF2 /* keycodes */; }; @@ -125,44 +102,32 @@ 757A2BF01F5AF9D6003EDB01 /* user_strings_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 757A2BEF1F5AF9D6003EDB01 /* user_strings_unix.cpp */; }; 75CBCF751F5DB3AD00830063 /* video_sdl2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75CBCF741F5DB3AD00830063 /* video_sdl2.cpp */; }; 75CBCF771F5DB65E00830063 /* video_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75CBCF761F5DB65E00830063 /* video_sdl.cpp */; }; + E413D92120D260BC00E437D8 /* tftp.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D8F820D260B900E437D8 /* tftp.c */; }; + E413D92220D260BC00E437D8 /* mbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D8F920D260B900E437D8 /* mbuf.c */; }; + E413D92320D260BC00E437D8 /* ip_icmp.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D8FB20D260B900E437D8 /* ip_icmp.c */; }; + E413D92420D260BC00E437D8 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = E413D8FE20D260B900E437D8 /* VERSION */; }; + E413D92520D260BC00E437D8 /* tcp_input.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D90120D260B900E437D8 /* tcp_input.c */; }; + E413D92620D260BC00E437D8 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D90220D260B900E437D8 /* misc.c */; }; + E413D92720D260BC00E437D8 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D90520D260BA00E437D8 /* debug.c */; }; + E413D92820D260BC00E437D8 /* tcp_subr.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D90620D260BA00E437D8 /* tcp_subr.c */; }; + E413D92920D260BC00E437D8 /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D90720D260BA00E437D8 /* udp.c */; }; + E413D92A20D260BC00E437D8 /* sbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D90920D260BA00E437D8 /* sbuf.c */; }; + E413D92B20D260BC00E437D8 /* COPYRIGHT in Resources */ = {isa = PBXBuildFile; fileRef = E413D90C20D260BA00E437D8 /* COPYRIGHT */; }; + E413D92C20D260BC00E437D8 /* slirp.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D90D20D260BA00E437D8 /* slirp.c */; }; + E413D92D20D260BC00E437D8 /* tcp_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D91120D260BA00E437D8 /* tcp_timer.c */; }; + E413D92E20D260BC00E437D8 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D91820D260BB00E437D8 /* socket.c */; }; + E413D92F20D260BC00E437D8 /* bootp.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D91B20D260BC00E437D8 /* bootp.c */; }; + E413D93020D260BC00E437D8 /* ip_input.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D91C20D260BC00E437D8 /* ip_input.c */; }; + E413D93120D260BC00E437D8 /* ip_output.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D91D20D260BC00E437D8 /* ip_output.c */; }; + E413D93220D260BC00E437D8 /* if.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D91E20D260BC00E437D8 /* if.c */; }; + E413D93320D260BC00E437D8 /* cksum.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D91F20D260BC00E437D8 /* cksum.c */; }; + E413D93420D260BC00E437D8 /* tcp_output.c in Sources */ = {isa = PBXBuildFile; fileRef = E413D92020D260BC00E437D8 /* tcp_output.c */; }; + E413D93620D260DA00E437D8 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E413D93520D260DA00E437D8 /* SDL2.framework */; }; + E413D93820D2613500E437D8 /* ether_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E413D93720D2613500E437D8 /* ether_unix.cpp */; }; + E413D93A20D2614E00E437D8 /* extfs_macosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E413D93920D2614E00E437D8 /* extfs_macosx.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 752F270C1F251B4A001032B4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 752F27051F251B4A001032B4 /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BECDF66C0761BA81005FE872; - remoteInfo = Framework; - }; - 752F270E1F251B4A001032B4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 752F27051F251B4A001032B4 /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BECDF6B30761BA81005FE872; - remoteInfo = "Static Library"; - }; - 752F27101F251B4A001032B4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 752F27051F251B4A001032B4 /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = DB31407717554B71006C0E22; - remoteInfo = "Shared Library"; - }; - 752F27121F251B4A001032B4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 752F27051F251B4A001032B4 /* SDL.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BECDF6BE0761BA81005FE872; - remoteInfo = "Standard DMG"; - }; - 752F27161F251B5C001032B4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 752F27051F251B4A001032B4 /* SDL.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = BECDF5FE0761BA81005FE872; - remoteInfo = Framework; - }; 7532530B1F53611F0024025B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7539DFAA1F23B17E006B2DF2 /* Project object */; @@ -200,7 +165,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 752F27151F251B5C001032B4 /* SDL2.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -226,53 +190,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 4ECAC23D1F8A89FE0013B963 /* slirp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = slirp.c; path = ../../slirp/slirp.c; sourceTree = ""; }; - 4ECAC23E1F8A89FE0013B963 /* tcp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tcp.h; path = ../../slirp/tcp.h; sourceTree = ""; }; - 4ECAC23F1F8A89FE0013B963 /* debug.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = debug.c; path = ../../slirp/debug.c; sourceTree = ""; }; - 4ECAC2401F8A89FE0013B963 /* misc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = misc.c; path = ../../slirp/misc.c; sourceTree = ""; }; - 4ECAC2411F8A89FE0013B963 /* if.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = if.h; path = ../../slirp/if.h; sourceTree = ""; }; - 4ECAC2421F8A89FE0013B963 /* sbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sbuf.h; path = ../../slirp/sbuf.h; sourceTree = ""; }; - 4ECAC2431F8A89FE0013B963 /* socket.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = socket.c; path = ../../slirp/socket.c; sourceTree = ""; }; - 4ECAC2441F8A89FE0013B963 /* ip_icmp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ip_icmp.c; path = ../../slirp/ip_icmp.c; sourceTree = ""; }; - 4ECAC2451F8A89FE0013B963 /* socket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../../slirp/socket.h; sourceTree = ""; }; - 4ECAC2461F8A89FE0013B963 /* udp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = udp.h; path = ../../slirp/udp.h; sourceTree = ""; }; - 4ECAC2471F8A89FF0013B963 /* ip_output.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ip_output.c; path = ../../slirp/ip_output.c; sourceTree = ""; }; - 4ECAC2481F8A89FF0013B963 /* ip_input.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ip_input.c; path = ../../slirp/ip_input.c; sourceTree = ""; }; - 4ECAC2491F8A89FF0013B963 /* icmp_var.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = icmp_var.h; path = ../../slirp/icmp_var.h; sourceTree = ""; }; - 4ECAC24A1F8A89FF0013B963 /* sbuf.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sbuf.c; path = ../../slirp/sbuf.c; sourceTree = ""; }; - 4ECAC24B1F8A89FF0013B963 /* slirp_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = slirp_config.h; path = ../../slirp/slirp_config.h; sourceTree = ""; }; - 4ECAC24C1F8A89FF0013B963 /* tcp_output.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tcp_output.c; path = ../../slirp/tcp_output.c; sourceTree = ""; }; - 4ECAC24D1F8A89FF0013B963 /* tcp_timer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tcp_timer.c; path = ../../slirp/tcp_timer.c; sourceTree = ""; }; - 4ECAC24E1F8A89FF0013B963 /* udp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = udp.c; path = ../../slirp/udp.c; sourceTree = ""; }; - 4ECAC24F1F8A89FF0013B963 /* mbuf.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mbuf.c; path = ../../slirp/mbuf.c; sourceTree = ""; }; - 4ECAC2501F8A8A000013B963 /* if.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = if.c; path = ../../slirp/if.c; sourceTree = ""; }; - 4ECAC2511F8A8A000013B963 /* ip_icmp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ip_icmp.h; path = ../../slirp/ip_icmp.h; sourceTree = ""; }; - 4ECAC2521F8A8A000013B963 /* tftp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tftp.c; path = ../../slirp/tftp.c; sourceTree = ""; }; - 4ECAC2531F8A8A000013B963 /* debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../../slirp/debug.h; sourceTree = ""; }; - 4ECAC2541F8A8A000013B963 /* cksum.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cksum.c; path = ../../slirp/cksum.c; sourceTree = ""; }; - 4ECAC2551F8A8A000013B963 /* tcp_var.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tcp_var.h; path = ../../slirp/tcp_var.h; sourceTree = ""; }; - 4ECAC2561F8A8A000013B963 /* slirp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = slirp.h; path = ../../slirp/slirp.h; sourceTree = ""; }; - 4ECAC2571F8A8A000013B963 /* tcp_subr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tcp_subr.c; path = ../../slirp/tcp_subr.c; sourceTree = ""; }; - 4ECAC2581F8A8A010013B963 /* ip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ip.h; path = ../../slirp/ip.h; sourceTree = ""; }; - 4ECAC2591F8A8A010013B963 /* bootp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = bootp.h; path = ../../slirp/bootp.h; sourceTree = ""; }; - 4ECAC25A1F8A8A010013B963 /* ctl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ctl.h; path = ../../slirp/ctl.h; sourceTree = ""; }; - 4ECAC25B1F8A8A010013B963 /* libslirp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libslirp.h; path = ../../slirp/libslirp.h; sourceTree = ""; }; - 4ECAC25C1F8A8A010013B963 /* VERSION */ = {isa = PBXFileReference; lastKnownFileType = text; name = VERSION; path = ../../slirp/VERSION; sourceTree = ""; }; - 4ECAC25D1F8A8A010013B963 /* tcpip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tcpip.h; path = ../../slirp/tcpip.h; sourceTree = ""; }; - 4ECAC25E1F8A8A020013B963 /* tcp_input.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tcp_input.c; path = ../../slirp/tcp_input.c; sourceTree = ""; }; - 4ECAC25F1F8A8A020013B963 /* misc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../slirp/misc.h; sourceTree = ""; }; - 4ECAC2601F8A8A020013B963 /* bootp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = bootp.c; path = ../../slirp/bootp.c; sourceTree = ""; }; - 4ECAC2611F8A8A020013B963 /* mbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mbuf.h; path = ../../slirp/mbuf.h; sourceTree = ""; }; - 4ECAC2621F8A8A020013B963 /* COPYRIGHT */ = {isa = PBXFileReference; lastKnownFileType = text; name = COPYRIGHT; path = ../../slirp/COPYRIGHT; sourceTree = ""; }; - 4ECAC2631F8A8A020013B963 /* main.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = main.h; path = ../../slirp/main.h; sourceTree = ""; }; - 4ECAC2641F8A8A020013B963 /* tcp_timer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tcp_timer.h; path = ../../slirp/tcp_timer.h; sourceTree = ""; }; - 4ECAC2651F8A8A030013B963 /* tftp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tftp.h; path = ../../slirp/tftp.h; sourceTree = ""; }; - 4ECAC2661F8A8A5D0013B963 /* ether_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ether_unix.cpp; path = ../../Unix/ether_unix.cpp; sourceTree = ""; }; 752F26F81F240E51001032B4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 752F26FA1F240E69001032B4 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 752F27001F242BAF001032B4 /* prefs_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = prefs_sdl.cpp; sourceTree = ""; }; 752F27021F242F51001032B4 /* xpram_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xpram_sdl.cpp; sourceTree = ""; }; - 752F27051F251B4A001032B4 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../external/SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = ""; }; 753252DA1F5358D30024025B /* build68k */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = build68k; sourceTree = BUILT_PRODUCTS_DIR; }; 753252E51F5359040024025B /* build68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = build68k.c; sourceTree = ""; }; 753252ED1F535DD10024025B /* defs68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = defs68k.c; path = build68k_output/defs68k.c; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -284,7 +205,6 @@ 7532532F1F5368370024025B /* cpustbl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cpustbl.cpp; path = gencpu_output/cpustbl.cpp; sourceTree = BUILT_PRODUCTS_DIR; }; 753253301F5368370024025B /* cputbl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cputbl.h; path = gencpu_output/cputbl.h; sourceTree = BUILT_PRODUCTS_DIR; }; 7539DFB21F23B17E006B2DF2 /* BasiliskII.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BasiliskII.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 7539DFBE1F23B17E006B2DF2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 7539DFC91F23B25A006B2DF2 /* adb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adb.cpp; path = ../adb.cpp; sourceTree = ""; }; 7539DFCA1F23B25A006B2DF2 /* audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audio.cpp; path = ../audio.cpp; sourceTree = ""; }; 7539DFCB1F23B25A006B2DF2 /* cdrom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cdrom.cpp; path = ../cdrom.cpp; sourceTree = ""; }; @@ -391,7 +311,6 @@ 7539E1FC1F23B32A006B2DF2 /* testlmem.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = testlmem.sh; sourceTree = ""; }; 7539E1FD1F23B32A006B2DF2 /* disk_sparsebundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk_sparsebundle.cpp; sourceTree = ""; }; 7539E1FE1F23B32A006B2DF2 /* disk_unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk_unix.h; sourceTree = ""; }; - 7539E2001F23B32A006B2DF2 /* extfs_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extfs_unix.cpp; sourceTree = ""; }; 7539E2011F23B32A006B2DF2 /* fbdevices */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fbdevices; sourceTree = ""; }; 7539E2051F23B32A006B2DF2 /* install-sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "install-sh"; sourceTree = ""; }; 7539E20A1F23B32A006B2DF2 /* keycodes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = keycodes; sourceTree = ""; }; @@ -437,6 +356,50 @@ 757A2BEF1F5AF9D6003EDB01 /* user_strings_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_strings_unix.cpp; sourceTree = ""; }; 75CBCF741F5DB3AD00830063 /* video_sdl2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_sdl2.cpp; sourceTree = ""; }; 75CBCF761F5DB65E00830063 /* video_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_sdl.cpp; sourceTree = ""; }; + E413D8F820D260B900E437D8 /* tftp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tftp.c; sourceTree = ""; }; + E413D8F920D260B900E437D8 /* mbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mbuf.c; sourceTree = ""; }; + E413D8FA20D260B900E437D8 /* tftp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tftp.h; sourceTree = ""; }; + E413D8FB20D260B900E437D8 /* ip_icmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ip_icmp.c; sourceTree = ""; }; + E413D8FC20D260B900E437D8 /* bootp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootp.h; sourceTree = ""; }; + E413D8FD20D260B900E437D8 /* tcpip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcpip.h; sourceTree = ""; }; + E413D8FE20D260B900E437D8 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = ""; }; + E413D8FF20D260B900E437D8 /* ip_icmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ip_icmp.h; sourceTree = ""; }; + E413D90020D260B900E437D8 /* slirp_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slirp_config.h; sourceTree = ""; }; + E413D90120D260B900E437D8 /* tcp_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_input.c; sourceTree = ""; }; + E413D90220D260B900E437D8 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = ""; }; + E413D90320D260BA00E437D8 /* udp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = udp.h; sourceTree = ""; }; + E413D90420D260BA00E437D8 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = ""; }; + E413D90520D260BA00E437D8 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = ""; }; + E413D90620D260BA00E437D8 /* tcp_subr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_subr.c; sourceTree = ""; }; + E413D90720D260BA00E437D8 /* udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = udp.c; sourceTree = ""; }; + E413D90820D260BA00E437D8 /* mbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mbuf.h; sourceTree = ""; }; + E413D90920D260BA00E437D8 /* sbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sbuf.c; sourceTree = ""; }; + E413D90A20D260BA00E437D8 /* ctl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ctl.h; sourceTree = ""; }; + E413D90B20D260BA00E437D8 /* slirp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slirp.h; sourceTree = ""; }; + E413D90C20D260BA00E437D8 /* COPYRIGHT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYRIGHT; sourceTree = ""; }; + E413D90D20D260BA00E437D8 /* slirp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = slirp.c; sourceTree = ""; }; + E413D90E20D260BA00E437D8 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = ""; }; + E413D90F20D260BA00E437D8 /* if.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = if.h; sourceTree = ""; }; + E413D91020D260BA00E437D8 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; + E413D91120D260BA00E437D8 /* tcp_timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_timer.c; sourceTree = ""; }; + E413D91220D260BB00E437D8 /* sbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sbuf.h; sourceTree = ""; }; + E413D91320D260BB00E437D8 /* tcp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcp.h; sourceTree = ""; }; + E413D91420D260BB00E437D8 /* ip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ip.h; sourceTree = ""; }; + E413D91520D260BB00E437D8 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = ""; }; + E413D91620D260BB00E437D8 /* tcp_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcp_timer.h; sourceTree = ""; }; + E413D91720D260BB00E437D8 /* tcp_var.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcp_var.h; sourceTree = ""; }; + E413D91820D260BB00E437D8 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = ""; }; + E413D91920D260BB00E437D8 /* libslirp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libslirp.h; sourceTree = ""; }; + E413D91A20D260BC00E437D8 /* icmp_var.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icmp_var.h; sourceTree = ""; }; + E413D91B20D260BC00E437D8 /* bootp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bootp.c; sourceTree = ""; }; + E413D91C20D260BC00E437D8 /* ip_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ip_input.c; sourceTree = ""; }; + E413D91D20D260BC00E437D8 /* ip_output.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ip_output.c; sourceTree = ""; }; + E413D91E20D260BC00E437D8 /* if.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = if.c; sourceTree = ""; }; + E413D91F20D260BC00E437D8 /* cksum.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cksum.c; sourceTree = ""; }; + E413D92020D260BC00E437D8 /* tcp_output.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_output.c; sourceTree = ""; }; + E413D93520D260DA00E437D8 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../../Library/Frameworks/SDL2.framework; sourceTree = ""; }; + E413D93720D2613500E437D8 /* ether_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ether_unix.cpp; sourceTree = ""; }; + E413D93920D2614E00E437D8 /* extfs_macosx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extfs_macosx.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -458,8 +421,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E413D93620D260DA00E437D8 /* SDL2.framework in Frameworks */, 756C1B391F25306A00620917 /* AppKit.framework in Frameworks */, - 752F27141F251B5C001032B4 /* SDL2.framework in Frameworks */, 752F26FB1F240E69001032B4 /* IOKit.framework in Frameworks */, 752F26F91F240E51001032B4 /* Foundation.framework in Frameworks */, ); @@ -471,48 +434,47 @@ 4ECAC23C1F8A89ED0013B963 /* slirp */ = { isa = PBXGroup; children = ( - 4ECAC2661F8A8A5D0013B963 /* ether_unix.cpp */, - 4ECAC2601F8A8A020013B963 /* bootp.c */, - 4ECAC2591F8A8A010013B963 /* bootp.h */, - 4ECAC2541F8A8A000013B963 /* cksum.c */, - 4ECAC2621F8A8A020013B963 /* COPYRIGHT */, - 4ECAC25A1F8A8A010013B963 /* ctl.h */, - 4ECAC23F1F8A89FE0013B963 /* debug.c */, - 4ECAC2531F8A8A000013B963 /* debug.h */, - 4ECAC2491F8A89FF0013B963 /* icmp_var.h */, - 4ECAC2501F8A8A000013B963 /* if.c */, - 4ECAC2411F8A89FE0013B963 /* if.h */, - 4ECAC2441F8A89FE0013B963 /* ip_icmp.c */, - 4ECAC2511F8A8A000013B963 /* ip_icmp.h */, - 4ECAC2481F8A89FF0013B963 /* ip_input.c */, - 4ECAC2471F8A89FF0013B963 /* ip_output.c */, - 4ECAC2581F8A8A010013B963 /* ip.h */, - 4ECAC25B1F8A8A010013B963 /* libslirp.h */, - 4ECAC2631F8A8A020013B963 /* main.h */, - 4ECAC24F1F8A89FF0013B963 /* mbuf.c */, - 4ECAC2611F8A8A020013B963 /* mbuf.h */, - 4ECAC2401F8A89FE0013B963 /* misc.c */, - 4ECAC25F1F8A8A020013B963 /* misc.h */, - 4ECAC24A1F8A89FF0013B963 /* sbuf.c */, - 4ECAC2421F8A89FE0013B963 /* sbuf.h */, - 4ECAC24B1F8A89FF0013B963 /* slirp_config.h */, - 4ECAC23D1F8A89FE0013B963 /* slirp.c */, - 4ECAC2561F8A8A000013B963 /* slirp.h */, - 4ECAC2431F8A89FE0013B963 /* socket.c */, - 4ECAC2451F8A89FE0013B963 /* socket.h */, - 4ECAC25E1F8A8A020013B963 /* tcp_input.c */, - 4ECAC24C1F8A89FF0013B963 /* tcp_output.c */, - 4ECAC2571F8A8A000013B963 /* tcp_subr.c */, - 4ECAC24D1F8A89FF0013B963 /* tcp_timer.c */, - 4ECAC2641F8A8A020013B963 /* tcp_timer.h */, - 4ECAC2551F8A8A000013B963 /* tcp_var.h */, - 4ECAC23E1F8A89FE0013B963 /* tcp.h */, - 4ECAC25D1F8A8A010013B963 /* tcpip.h */, - 4ECAC2521F8A8A000013B963 /* tftp.c */, - 4ECAC2651F8A8A030013B963 /* tftp.h */, - 4ECAC24E1F8A89FF0013B963 /* udp.c */, - 4ECAC2461F8A89FE0013B963 /* udp.h */, - 4ECAC25C1F8A8A010013B963 /* VERSION */, + E413D91B20D260BC00E437D8 /* bootp.c */, + E413D8FC20D260B900E437D8 /* bootp.h */, + E413D91F20D260BC00E437D8 /* cksum.c */, + E413D90C20D260BA00E437D8 /* COPYRIGHT */, + E413D90A20D260BA00E437D8 /* ctl.h */, + E413D90520D260BA00E437D8 /* debug.c */, + E413D91520D260BB00E437D8 /* debug.h */, + E413D91A20D260BC00E437D8 /* icmp_var.h */, + E413D91E20D260BC00E437D8 /* if.c */, + E413D90F20D260BA00E437D8 /* if.h */, + E413D8FB20D260B900E437D8 /* ip_icmp.c */, + E413D8FF20D260B900E437D8 /* ip_icmp.h */, + E413D91C20D260BC00E437D8 /* ip_input.c */, + E413D91D20D260BC00E437D8 /* ip_output.c */, + E413D91420D260BB00E437D8 /* ip.h */, + E413D91920D260BB00E437D8 /* libslirp.h */, + E413D90420D260BA00E437D8 /* main.h */, + E413D8F920D260B900E437D8 /* mbuf.c */, + E413D90820D260BA00E437D8 /* mbuf.h */, + E413D90220D260B900E437D8 /* misc.c */, + E413D91020D260BA00E437D8 /* misc.h */, + E413D90920D260BA00E437D8 /* sbuf.c */, + E413D91220D260BB00E437D8 /* sbuf.h */, + E413D90020D260B900E437D8 /* slirp_config.h */, + E413D90D20D260BA00E437D8 /* slirp.c */, + E413D90B20D260BA00E437D8 /* slirp.h */, + E413D91820D260BB00E437D8 /* socket.c */, + E413D90E20D260BA00E437D8 /* socket.h */, + E413D90120D260B900E437D8 /* tcp_input.c */, + E413D92020D260BC00E437D8 /* tcp_output.c */, + E413D90620D260BA00E437D8 /* tcp_subr.c */, + E413D91120D260BA00E437D8 /* tcp_timer.c */, + E413D91620D260BB00E437D8 /* tcp_timer.h */, + E413D91720D260BB00E437D8 /* tcp_var.h */, + E413D91320D260BB00E437D8 /* tcp.h */, + E413D8FD20D260B900E437D8 /* tcpip.h */, + E413D8F820D260B900E437D8 /* tftp.c */, + E413D8FA20D260B900E437D8 /* tftp.h */, + E413D90720D260BA00E437D8 /* udp.c */, + E413D90320D260BA00E437D8 /* udp.h */, + E413D8FE20D260B900E437D8 /* VERSION */, ); name = slirp; path = ../slirp; @@ -521,6 +483,7 @@ 752F26F71F240E51001032B4 /* Frameworks */ = { isa = PBXGroup; children = ( + E413D93520D260DA00E437D8 /* SDL2.framework */, 756C1B381F25306A00620917 /* AppKit.framework */, 752F26FA1F240E69001032B4 /* IOKit.framework */, 752F26F81F240E51001032B4 /* Foundation.framework */, @@ -528,25 +491,6 @@ name = Frameworks; sourceTree = ""; }; - 752F27041F251B27001032B4 /* external */ = { - isa = PBXGroup; - children = ( - 752F27051F251B4A001032B4 /* SDL.xcodeproj */, - ); - name = external; - sourceTree = ""; - }; - 752F27061F251B4A001032B4 /* Products */ = { - isa = PBXGroup; - children = ( - 752F270D1F251B4A001032B4 /* SDL2.framework */, - 752F270F1F251B4A001032B4 /* libSDL2.a */, - 752F27111F251B4A001032B4 /* libSDL2.dylib */, - 752F27131F251B4A001032B4 /* Standard DMG */, - ); - name = Products; - sourceTree = ""; - }; 753252FF1F535E5D0024025B /* generated src */ = { isa = PBXGroup; children = ( @@ -581,8 +525,6 @@ children = ( 7539E1E41F23B25E006B2DF2 /* src */, 753252FF1F535E5D0024025B /* generated src */, - 752F27041F251B27001032B4 /* external */, - 7539DFB41F23B17E006B2DF2 /* Assets */, 7539DFB31F23B17E006B2DF2 /* Products */, 752F26F71F240E51001032B4 /* Frameworks */, ); @@ -599,15 +541,6 @@ path = ../../../../../../../../Documents/Code/macemu/BasiliskII/src/MacOSX; sourceTree = BUILT_PRODUCTS_DIR; }; - 7539DFB41F23B17E006B2DF2 /* Assets */ = { - isa = PBXGroup; - children = ( - 7539DFBE1F23B17E006B2DF2 /* Assets.xcassets */, - ); - name = Assets; - path = BasiliskII; - sourceTree = ""; - }; 7539DFCC1F23B25A006B2DF2 /* CrossPlatform */ = { isa = PBXGroup; children = ( @@ -671,6 +604,7 @@ 7539DFFB1F23B25A006B2DF2 /* audio_defs_macosx.h */, 7539E0021F23B25A006B2DF2 /* BasiliskII.icns */, 7539E00A1F23B25A006B2DF2 /* Credits.html */, + E413D93920D2614E00E437D8 /* extfs_macosx.cpp */, 7539E00F1F23B25A006B2DF2 /* InfoPlist.strings */, 7539E0141F23B25A006B2DF2 /* HowTo.html */, 7539E29C1F23C83F006B2DF2 /* sys_darwin.cpp */, @@ -798,7 +732,7 @@ 7539E1F71F23B329006B2DF2 /* Darwin */, 7539E1FD1F23B32A006B2DF2 /* disk_sparsebundle.cpp */, 7539E1FE1F23B32A006B2DF2 /* disk_unix.h */, - 7539E2001F23B32A006B2DF2 /* extfs_unix.cpp */, + E413D93720D2613500E437D8 /* ether_unix.cpp */, 7539E2011F23B32A006B2DF2 /* fbdevices */, 7539E2051F23B32A006B2DF2 /* install-sh */, 7539E20A1F23B32A006B2DF2 /* keycodes */, @@ -958,7 +892,6 @@ ); dependencies = ( 7532531F1F5364170024025B /* PBXTargetDependency */, - 752F27171F251B5C001032B4 /* PBXTargetDependency */, ); name = BasiliskII; productName = BasiliskII; @@ -1007,12 +940,6 @@ mainGroup = 7539DFA91F23B17E006B2DF2; productRefGroup = 7539DFB31F23B17E006B2DF2 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 752F27061F251B4A001032B4 /* Products */; - ProjectRef = 752F27051F251B4A001032B4 /* SDL.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 7539DFB11F23B17E006B2DF2 /* BasiliskII */, @@ -1024,37 +951,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 752F270D1F251B4A001032B4 /* SDL2.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = SDL2.framework; - remoteRef = 752F270C1F251B4A001032B4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 752F270F1F251B4A001032B4 /* libSDL2.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDL2.a; - remoteRef = 752F270E1F251B4A001032B4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 752F27111F251B4A001032B4 /* libSDL2.dylib */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = libSDL2.dylib; - remoteRef = 752F27101F251B4A001032B4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 752F27131F251B4A001032B4 /* Standard DMG */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = "Standard DMG"; - remoteRef = 752F27121F251B4A001032B4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 7539DFB01F23B17E006B2DF2 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1073,7 +969,6 @@ 7539E2501F23B32A006B2DF2 /* install-sh in Resources */, 7539E1301F23B25A006B2DF2 /* Assets.xcassets in Resources */, 7539E2641F23B32A006B2DF2 /* mkinstalldirs in Resources */, - 7539DFBF1F23B17E006B2DF2 /* Assets.xcassets in Resources */, 7539E2581F23B32A006B2DF2 /* linux-x86_64.ld in Resources */, 7539E2451F23B32A006B2DF2 /* gtk-osx.patch in Resources */, 7539E2AB1F23CDB7006B2DF2 /* Info.plist in Resources */, @@ -1081,7 +976,9 @@ 7539E14B1F23B25A006B2DF2 /* ToDo.html in Resources */, 7539E13E1F23B25A006B2DF2 /* HowTo.html in Resources */, 7539E1751F23B25A006B2DF2 /* keycodes in Resources */, + E413D92B20D260BC00E437D8 /* COPYRIGHT in Resources */, 7539E14D1F23B25A006B2DF2 /* Versions.html in Resources */, + E413D92420D260BC00E437D8 /* VERSION in Resources */, 7539E2711F23B32A006B2DF2 /* tunconfig in Resources */, 7539E2561F23B32A006B2DF2 /* linux-i386.ld in Resources */, 7539E2551F23B32A006B2DF2 /* freebsd-i386.ld in Resources */, @@ -1137,82 +1034,82 @@ 7539E19E1F23B25A006B2DF2 /* rounding.cpp in Sources */, 7539E29D1F23C83F006B2DF2 /* sys_darwin.cpp in Sources */, 7539E1291F23B25A006B2DF2 /* video_blit.cpp in Sources */, - 4ECAC2701F8A8B230013B963 /* misc.c in Sources */, - 4ECAC26E1F8A8B120013B963 /* ip_output.c in Sources */, - 4ECAC2781F8A8B4B0013B963 /* tftp.c in Sources */, + E413D93320D260BC00E437D8 /* cksum.c in Sources */, + E413D92920D260BC00E437D8 /* udp.c in Sources */, 7539E28E1F23C56F006B2DF2 /* clip_dummy.cpp in Sources */, 7539E1A01F23B25A006B2DF2 /* memory.cpp in Sources */, 753253351F53688D0024025B /* readcpu.cpp in Sources */, - 4ECAC26B1F8A8B010013B963 /* if.c in Sources */, 7539E1741F23B25A006B2DF2 /* audio_sdl.cpp in Sources */, 753252EE1F535DD10024025B /* defs68k.c in Sources */, + E413D93120D260BC00E437D8 /* ip_output.c in Sources */, 7539E29F1F23C939006B2DF2 /* fpu_uae.cpp in Sources */, 7539E1E21F23B25A006B2DF2 /* video.cpp in Sources */, 7539E18F1F23B25A006B2DF2 /* timer.cpp in Sources */, 7539E1711F23B25A006B2DF2 /* rom_patches.cpp in Sources */, 7539E1281F23B25A006B2DF2 /* sigsegv.cpp in Sources */, 753253341F5368370024025B /* cpustbl.cpp in Sources */, - 4ECAC2761F8A8B480013B963 /* tcp_subr.c in Sources */, 756C1B341F252FC100620917 /* utils_macosx.mm in Sources */, + E413D92620D260BC00E437D8 /* misc.c in Sources */, 753253321F5368370024025B /* cpuemu.cpp in Sources */, 7539E2701F23B32A006B2DF2 /* tinyxml2.cpp in Sources */, 7539E1721F23B25A006B2DF2 /* rsrc_patches.cpp in Sources */, 7539E2931F23C56F006B2DF2 /* serial_dummy.cpp in Sources */, 7539E1981F23B25A006B2DF2 /* exceptions.cpp in Sources */, 75CBCF771F5DB65E00830063 /* video_sdl.cpp in Sources */, - 4ECAC2771F8A8B480013B963 /* tcp_timer.c in Sources */, 7539E1901F23B25A006B2DF2 /* basilisk_glue.cpp in Sources */, - 4ECAC26D1F8A8B120013B963 /* ip_input.c in Sources */, - 4ECAC2791F8A8B530013B963 /* udp.c in Sources */, 7539E2801F23C4CA006B2DF2 /* main_unix.cpp in Sources */, 7539E1E11F23B25A006B2DF2 /* user_strings.cpp in Sources */, 75CBCF751F5DB3AD00830063 /* video_sdl2.cpp in Sources */, 752F27011F242BAF001032B4 /* prefs_sdl.cpp in Sources */, 7539E2971F23C5FD006B2DF2 /* newcpu.cpp in Sources */, 7539E12A1F23B25A006B2DF2 /* vm_alloc.cpp in Sources */, - 4ECAC26F1F8A8B230013B963 /* mbuf.c in Sources */, + E413D93220D260BC00E437D8 /* if.c in Sources */, 753253331F5368370024025B /* cpustbl_nf.cpp in Sources */, 7539E16C1F23B25A006B2DF2 /* main.cpp in Sources */, 7539E26D1F23B32A006B2DF2 /* strlcpy.c in Sources */, + E413D93420D260BC00E437D8 /* tcp_output.c in Sources */, 7539E26E1F23B32A006B2DF2 /* sys_unix.cpp in Sources */, - 4ECAC2721F8A8B390013B963 /* slirp.c in Sources */, 7539E1271F23B25A006B2DF2 /* cdrom.cpp in Sources */, + E413D92A20D260BC00E437D8 /* sbuf.c in Sources */, 753253311F5368370024025B /* cpuemu_nf.cpp in Sources */, 7539E1261F23B25A006B2DF2 /* audio.cpp in Sources */, + E413D93820D2613500E437D8 /* ether_unix.cpp in Sources */, 7539E1701F23B25A006B2DF2 /* prefs.cpp in Sources */, + E413D92E20D260BC00E437D8 /* socket.c in Sources */, 7539E12D1F23B25A006B2DF2 /* ether.cpp in Sources */, - 4ECAC2731F8A8B390013B963 /* socket.c in Sources */, 7539E26C1F23B32A006B2DF2 /* sshpty.c in Sources */, - 4ECAC2741F8A8B480013B963 /* tcp_input.c in Sources */, - 4ECAC26A1F8A8AF80013B963 /* debug.c in Sources */, 7539E1781F23B25A006B2DF2 /* serial.cpp in Sources */, 757A2BF01F5AF9D6003EDB01 /* user_strings_unix.cpp in Sources */, + E413D92D20D260BC00E437D8 /* tcp_timer.c in Sources */, + E413D92820D260BC00E437D8 /* tcp_subr.c in Sources */, 7539E1991F23B25A006B2DF2 /* flags.cpp in Sources */, - 4ECAC2691F8A8AF10013B963 /* cksum.c in Sources */, 7539E2921F23C56F006B2DF2 /* scsi_dummy.cpp in Sources */, + E413D93A20D2614E00E437D8 /* extfs_macosx.cpp in Sources */, 7539E16F1F23B25A006B2DF2 /* prefs_items.cpp in Sources */, 7539E18E1F23B25A006B2DF2 /* sony.cpp in Sources */, 7539E26F1F23B32A006B2DF2 /* timer_unix.cpp in Sources */, 7539E12E1F23B25A006B2DF2 /* extfs.cpp in Sources */, 7539E23F1F23B32A006B2DF2 /* bincue_unix.cpp in Sources */, 7539E12C1F23B25A006B2DF2 /* emul_op.cpp in Sources */, + E413D92720D260BC00E437D8 /* debug.c in Sources */, + E413D92220D260BC00E437D8 /* mbuf.c in Sources */, 7539E19D1F23B25A006B2DF2 /* mathlib.cpp in Sources */, - 4ECAC2671F8A8A5D0013B963 /* ether_unix.cpp in Sources */, + E413D93020D260BC00E437D8 /* ip_input.c in Sources */, 752F27031F242F51001032B4 /* xpram_sdl.cpp in Sources */, 7539E16D1F23B25A006B2DF2 /* pict.c in Sources */, 7539E1251F23B25A006B2DF2 /* adb.cpp in Sources */, - 4ECAC2751F8A8B480013B963 /* tcp_output.c in Sources */, + E413D92C20D260BC00E437D8 /* slirp.c in Sources */, 7539E12F1F23B25A006B2DF2 /* macos_util.cpp in Sources */, 7539E24A1F23B32A006B2DF2 /* disk_sparsebundle.cpp in Sources */, - 4ECAC26C1F8A8B120013B963 /* ip_icmp.c in Sources */, 7539E18D1F23B25A006B2DF2 /* slot_rom.cpp in Sources */, + E413D92520D260BC00E437D8 /* tcp_input.c in Sources */, + E413D92120D260BC00E437D8 /* tftp.c in Sources */, 7539E1731F23B25A006B2DF2 /* scsi.cpp in Sources */, 7539E12B1F23B25A006B2DF2 /* disk.cpp in Sources */, + E413D92320D260BC00E437D8 /* ip_icmp.c in Sources */, 7539E1E31F23B25A006B2DF2 /* xpram.cpp in Sources */, - 4ECAC2681F8A8AE90013B963 /* bootp.c in Sources */, - 4ECAC2711F8A8B350013B963 /* sbuf.c in Sources */, - 7539E24C1F23B32A006B2DF2 /* extfs_unix.cpp in Sources */, 7539E2681F23B32A006B2DF2 /* rpc_unix.cpp in Sources */, + E413D92F20D260BC00E437D8 /* bootp.c in Sources */, 7539E2911F23C56F006B2DF2 /* prefs_editor_dummy.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1220,11 +1117,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 752F27171F251B5C001032B4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Framework; - targetProxy = 752F27161F251B5C001032B4 /* PBXContainerItemProxy */; - }; 7532530C1F53611F0024025B /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 753252D91F5358D30024025B /* build68k */; @@ -1462,7 +1354,7 @@ GCC_USE_STANDARD_INCLUDE_SEARCHING = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = NO; HEADER_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)/SDL2.framework/Headers", + /Library/Frameworks/SDL2.framework/Headers, ../MacOSX, ../include, ../uae_cpu, @@ -1472,7 +1364,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = ""; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII; @@ -1512,7 +1404,7 @@ GCC_USE_STANDARD_INCLUDE_SEARCHING = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = NO; HEADER_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)/SDL2.framework/Headers", + /Library/Frameworks/SDL2.framework/Headers, ../MacOSX, ../include, ../uae_cpu, @@ -1522,7 +1414,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = ""; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII; diff --git a/BasiliskII/src/MacOSX/config.h b/BasiliskII/src/MacOSX/config.h index f75200eb..ab1f6ee5 100644 --- a/BasiliskII/src/MacOSX/config.h +++ b/BasiliskII/src/MacOSX/config.h @@ -43,7 +43,6 @@ /* Define if using video enabled on SEGV signals. */ /* #undef ENABLE_VOSF */ -#define ENABLE_VOSF 1 /* Define if using XFree86 DGA extension. */ /* #undef ENABLE_XF86_DGA */ diff --git a/BasiliskII/src/MacOSX/run_build68k_for_xcode.sh b/BasiliskII/src/MacOSX/run_build68k_for_xcode.sh index 30047f7f..3a34fc01 100755 --- a/BasiliskII/src/MacOSX/run_build68k_for_xcode.sh +++ b/BasiliskII/src/MacOSX/run_build68k_for_xcode.sh @@ -6,7 +6,7 @@ # Generates files for 68k emulation, via UAE's virtual cpu, for use on Mac OS X hosts # -if [ ! -d "$BUILT_PRODUCTS_DIR" ] || [ ! "$PROJECT_DIR" ]; then +if [ ! "$BUILT_PRODUCTS_DIR" ] || [ ! "$PROJECT_DIR" ]; then echo "ERROR: $(basename $0) must be run from an Xcode 'External Build System' target" exit 1 fi @@ -23,6 +23,10 @@ case "$1" in rm -rf "$BUILT_PRODUCTS_DIR/build68k_output" ;; "") + if [ ! -d "$BUILT_PRODUCTS_DIR" ]; then + echo "No built products directory" + exit 1 + fi echo "Running build68k" cd "$BUILT_PRODUCTS_DIR" mkdir -p build68k_output diff --git a/BasiliskII/src/MacOSX/run_gencpu_for_xcode.sh b/BasiliskII/src/MacOSX/run_gencpu_for_xcode.sh index 16c014df..e457b8fa 100755 --- a/BasiliskII/src/MacOSX/run_gencpu_for_xcode.sh +++ b/BasiliskII/src/MacOSX/run_gencpu_for_xcode.sh @@ -6,7 +6,7 @@ # Generates files for 68k emulation, via UAE's virtual cpu, for use on Mac OS X hosts # -if [ ! -d "$BUILT_PRODUCTS_DIR" ] || [ ! "$PROJECT_DIR" ]; then +if [ ! "$BUILT_PRODUCTS_DIR" ] || [ ! "$PROJECT_DIR" ]; then echo "ERROR: $(basename $0) must be run from an Xcode 'External Build System' target" exit 1 fi @@ -23,6 +23,10 @@ case "$1" in rm -rf "$BUILT_PRODUCTS_DIR/gencpu_output" ;; "") + if [ ! -d "$BUILT_PRODUCTS_DIR" ]; then + echo "No built products directory" + exit 1 + fi echo "Running gencpu" cd "$BUILT_PRODUCTS_DIR" mkdir -p gencpu_output diff --git a/BasiliskII/src/SDL/video_sdl2.cpp b/BasiliskII/src/SDL/video_sdl2.cpp index 0b4bfb86..6d96a2fc 100644 --- a/BasiliskII/src/SDL/video_sdl2.cpp +++ b/BasiliskII/src/SDL/video_sdl2.cpp @@ -719,11 +719,11 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags // Apply anti-aliasing, if and when appropriate (usually in fullscreen) SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); - +/* // Always use a resize-able window. This helps allow SDL to manage // transitions involving fullscreen to or from windowed-mode. window_flags |= SDL_WINDOW_RESIZABLE; - +*/ if (!sdl_window) { sdl_window = SDL_CreateWindow( "Basilisk II", @@ -737,6 +737,7 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags return NULL; } } + if (flags & SDL_WINDOW_FULLSCREEN) SDL_SetWindowGrab(sdl_window, SDL_TRUE); // Some SDL events (regarding some native-window events), need processing // as they are generated. SDL2 has a facility, SDL_AddEventWatch(), which @@ -842,6 +843,8 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags static int present_sdl_video() { + if (SDL_RectEmpty(&sdl_update_video_rect)) return 0; + if (!sdl_renderer || !sdl_texture || !guest_surface) { printf("WARNING: A video mode does not appear to have been set.\n"); return -1; @@ -1010,6 +1013,13 @@ void driver_base::adapt_to_video_mode() { if (private_data) private_data->cursorHardware = hardware_cursor; #endif + SDL_LockMutex(sdl_update_video_mutex); + sdl_update_video_rect.x = 0; + sdl_update_video_rect.y = 0; + sdl_update_video_rect.w = VIDEO_MODE_X; + sdl_update_video_rect.h = VIDEO_MODE_Y; + SDL_UnlockMutex(sdl_update_video_mutex); + // Hide cursor SDL_ShowCursor(hardware_cursor); @@ -1528,9 +1538,13 @@ static void do_toggle_fullscreen(void) if (display_type == DISPLAY_SCREEN) { display_type = DISPLAY_WINDOW; SDL_SetWindowFullscreen(sdl_window, 0); + const VIDEO_MODE &mode = drv->mode; + SDL_SetWindowSize(sdl_window, VIDEO_MODE_X, VIDEO_MODE_Y); + SDL_SetWindowGrab(sdl_window, SDL_FALSE); } else { display_type = DISPLAY_SCREEN; SDL_SetWindowFullscreen(sdl_window, SDL_WINDOW_FULLSCREEN_DESKTOP); + SDL_SetWindowGrab(sdl_window, SDL_TRUE); } } @@ -1765,7 +1779,7 @@ void SDL_monitor_desc::switch_to_current_mode(void) #ifdef SHEEPSHAVER bool video_can_change_cursor(void) { - if (display_type != DISPLAY_WINDOW) + if (display_type != DISPLAY_WINDOW || !PrefsFindBool("hardcursor")) return false; return true; @@ -2586,7 +2600,7 @@ static int redraw_func(void *arg) // Wait next += VIDEO_REFRESH_DELAY; - uint64 delay = int32(next - GetTicks_usec()); + int32 delay = int32(next - GetTicks_usec()); if (delay > 0) Delay_usec(delay); else if (delay < -VIDEO_REFRESH_DELAY) diff --git a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj index de94c896..e46da6e2 100755 --- a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj +++ b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj @@ -28,7 +28,6 @@ 0846E4C114B1268B00574779 /* jit-cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CDCD14A99EEF000B1711 /* jit-cache.cpp */; }; 0846E4C214B1269600574779 /* basic-dyngen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CDC514A99EEF000B1711 /* basic-dyngen.cpp */; }; 0846E51314B128ED00574779 /* sheepshaver_glue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CDBB14A99EEF000B1711 /* sheepshaver_glue.cpp */; }; - 0846E65414B513CE00574779 /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 0856D17414A9A1A2000B1711 /* SDL.framework */; }; 0856CFC114A99EF0000B1711 /* adb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CD4B14A99EEF000B1711 /* adb.cpp */; }; 0856CFC214A99EF0000B1711 /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CD4C14A99EEF000B1711 /* audio.cpp */; }; 0856CFE214A99EF0000B1711 /* cdrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CD7814A99EEF000B1711 /* cdrom.cpp */; }; @@ -51,27 +50,7 @@ 0856D06014A99EF1000B1711 /* rsrc_patches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE8D14A99EF0000B1711 /* rsrc_patches.cpp */; }; 0856D06114A99EF1000B1711 /* scsi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE8E14A99EF0000B1711 /* scsi.cpp */; }; 0856D06214A99EF1000B1711 /* audio_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9014A99EF0000B1711 /* audio_sdl.cpp */; }; - 0856D06414A99EF1000B1711 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9314A99EF0000B1711 /* SDLMain.m */; }; - 0856D06514A99EF1000B1711 /* video_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9414A99EF0000B1711 /* video_sdl.cpp */; }; 0856D06614A99EF1000B1711 /* serial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9514A99EF0000B1711 /* serial.cpp */; }; - 0856D06714A99EF1000B1711 /* bootp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9714A99EF0000B1711 /* bootp.c */; }; - 0856D06814A99EF1000B1711 /* cksum.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9914A99EF0000B1711 /* cksum.c */; }; - 0856D06A14A99EF1000B1711 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9C14A99EF0000B1711 /* debug.c */; }; - 0856D06B14A99EF1000B1711 /* if.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE9F14A99EF0000B1711 /* if.c */; }; - 0856D06C14A99EF1000B1711 /* ip_icmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEA214A99EF0000B1711 /* ip_icmp.c */; }; - 0856D06D14A99EF1000B1711 /* ip_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEA414A99EF0000B1711 /* ip_input.c */; }; - 0856D06E14A99EF1000B1711 /* ip_output.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEA514A99EF0000B1711 /* ip_output.c */; }; - 0856D06F14A99EF1000B1711 /* mbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEA814A99EF0000B1711 /* mbuf.c */; }; - 0856D07014A99EF1000B1711 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEAA14A99EF0000B1711 /* misc.c */; }; - 0856D07114A99EF1000B1711 /* sbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEAC14A99EF0000B1711 /* sbuf.c */; }; - 0856D07214A99EF1000B1711 /* slirp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEAE14A99EF0000B1711 /* slirp.c */; }; - 0856D07314A99EF1000B1711 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEB114A99EF0000B1711 /* socket.c */; }; - 0856D07414A99EF1000B1711 /* tcp_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEB414A99EF0000B1711 /* tcp_input.c */; settings = {COMPILER_FLAGS = "-O1"; }; }; - 0856D07514A99EF1000B1711 /* tcp_output.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEB514A99EF0000B1711 /* tcp_output.c */; }; - 0856D07614A99EF1000B1711 /* tcp_subr.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEB614A99EF0000B1711 /* tcp_subr.c */; }; - 0856D07714A99EF1000B1711 /* tcp_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEB714A99EF0000B1711 /* tcp_timer.c */; }; - 0856D07814A99EF1000B1711 /* tftp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEBB14A99EF0000B1711 /* tftp.c */; }; - 0856D07914A99EF1000B1711 /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEBD14A99EF0000B1711 /* udp.c */; }; 0856D07B14A99EF1000B1711 /* sony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEC014A99EF0000B1711 /* sony.cpp */; }; 0856D07C14A99EF1000B1711 /* thunks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEC114A99EF0000B1711 /* thunks.cpp */; }; 0856D07D14A99EF1000B1711 /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CEC214A99EF0000B1711 /* timer.cpp */; }; @@ -91,7 +70,6 @@ 0856D11714A99EF1000B1711 /* user_strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CF7714A99EF0000B1711 /* user_strings.cpp */; }; 0856D11814A99EF1000B1711 /* video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CF7814A99EF0000B1711 /* video.cpp */; }; 0856D13F14A99EF1000B1711 /* xpram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CFC014A99EF0000B1711 /* xpram.cpp */; }; - 0856D17514A9A1A2000B1711 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0856D17414A9A1A2000B1711 /* SDL.framework */; }; 0856D21514A9A6C6000B1711 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0856D21414A9A6C6000B1711 /* IOKit.framework */; }; 0856D33514A9A704000B1711 /* VMSettingsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 0856D30714A9A704000B1711 /* VMSettingsWindow.nib */; }; 0856D33914A9A704000B1711 /* VMSettingsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0856D31214A9A704000B1711 /* VMSettingsController.mm */; }; @@ -102,11 +80,35 @@ 08CD42DC14B7B85B009CA2A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */; }; 08CD42E814B7B8AA009CA2A2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */; }; A7B1921418C35D4700791D8D /* DiskType.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B1921318C35D4700791D8D /* DiskType.m */; }; + E413A40320CF7E6D00FBE967 /* video_sdl2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E413A40220CF7E6D00FBE967 /* video_sdl2.cpp */; }; + E41936C420CFE64D003A7654 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = E41936C320CFE64D003A7654 /* SDLMain.m */; }; + E420910120D0C4FA0094654F /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E420910020D0C4FA0094654F /* SDL2.framework */; }; E4302EE31FBFE7FA00A5B500 /* lowmem.c in Sources */ = {isa = PBXBuildFile; fileRef = E4302EE21FBFE7FA00A5B500 /* lowmem.c */; }; E444DC1520C8F06700DD29C9 /* pict.c in Sources */ = {isa = PBXBuildFile; fileRef = E444DC1420C8F06700DD29C9 /* pict.c */; }; + E44C460520D262B0000583AE /* tftp.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45DC20D262AD000583AE /* tftp.c */; }; + E44C460620D262B0000583AE /* mbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45DD20D262AD000583AE /* mbuf.c */; }; + E44C460720D262B0000583AE /* ip_icmp.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45DF20D262AD000583AE /* ip_icmp.c */; }; + E44C460820D262B0000583AE /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = E44C45E220D262AE000583AE /* VERSION */; }; + E44C460920D262B0000583AE /* tcp_input.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45E520D262AE000583AE /* tcp_input.c */; }; + E44C460A20D262B0000583AE /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45E620D262AE000583AE /* misc.c */; }; + E44C460B20D262B0000583AE /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45E920D262AE000583AE /* debug.c */; }; + E44C460C20D262B0000583AE /* tcp_subr.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45EA20D262AE000583AE /* tcp_subr.c */; }; + E44C460D20D262B0000583AE /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45EB20D262AE000583AE /* udp.c */; }; + E44C460E20D262B0000583AE /* sbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45ED20D262AE000583AE /* sbuf.c */; }; + E44C460F20D262B0000583AE /* COPYRIGHT in Resources */ = {isa = PBXBuildFile; fileRef = E44C45F020D262AE000583AE /* COPYRIGHT */; }; + E44C461020D262B0000583AE /* slirp.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45F120D262AE000583AE /* slirp.c */; }; + E44C461120D262B0000583AE /* tcp_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45F520D262AF000583AE /* tcp_timer.c */; }; + E44C461220D262B0000583AE /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45FC20D262AF000583AE /* socket.c */; }; + E44C461320D262B0000583AE /* bootp.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C45FF20D262AF000583AE /* bootp.c */; }; + E44C461420D262B0000583AE /* ip_input.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C460020D262AF000583AE /* ip_input.c */; }; + E44C461520D262B0000583AE /* ip_output.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C460120D262AF000583AE /* ip_output.c */; }; + E44C461620D262B0000583AE /* if.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C460220D262AF000583AE /* if.c */; }; + E44C461720D262B0000583AE /* cksum.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C460320D262AF000583AE /* cksum.c */; }; + E44C461820D262B0000583AE /* tcp_output.c in Sources */ = {isa = PBXBuildFile; fileRef = E44C460420D262AF000583AE /* tcp_output.c */; }; E456E2AD20C82B61006C8DC2 /* clip_macosx64.mm in Sources */ = {isa = PBXBuildFile; fileRef = E456E2AC20C82B60006C8DC2 /* clip_macosx64.mm */; }; E4C9A03E1FD55CDC00CABBF9 /* basic-dyngen-ops-x86_64_macos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E4C9A03D1FD55CDC00CABBF9 /* basic-dyngen-ops-x86_64_macos.hpp */; }; E4C9A0401FD55CE700CABBF9 /* ppc-dyngen-ops-x86_64_macos.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E4C9A03F1FD55CE700CABBF9 /* ppc-dyngen-ops-x86_64_macos.hpp */; }; + E4CBF46120CFC451009F40CC /* video_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4CBF46020CFC451009F40CC /* video_sdl.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -127,15 +129,14 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 0846E65E14B513DF00574779 /* Copy Frameworks */ = { + E413A40820CF7EF800FBE967 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 0846E65414B513CE00574779 /* SDL.framework in Copy Frameworks */, ); - name = "Copy Frameworks"; + name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -273,51 +274,7 @@ 0856CE8E14A99EF0000B1711 /* scsi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scsi.cpp; path = ../scsi.cpp; sourceTree = SOURCE_ROOT; }; 0856CE9014A99EF0000B1711 /* audio_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audio_sdl.cpp; sourceTree = ""; }; 0856CE9114A99EF0000B1711 /* keycodes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = keycodes; sourceTree = ""; }; - 0856CE9214A99EF0000B1711 /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = ""; }; - 0856CE9314A99EF0000B1711 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = ""; }; - 0856CE9414A99EF0000B1711 /* video_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_sdl.cpp; sourceTree = ""; }; 0856CE9514A99EF0000B1711 /* serial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = serial.cpp; path = ../serial.cpp; sourceTree = SOURCE_ROOT; }; - 0856CE9714A99EF0000B1711 /* bootp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bootp.c; sourceTree = ""; }; - 0856CE9814A99EF0000B1711 /* bootp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootp.h; sourceTree = ""; }; - 0856CE9914A99EF0000B1711 /* cksum.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cksum.c; sourceTree = ""; }; - 0856CE9A14A99EF0000B1711 /* COPYRIGHT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYRIGHT; sourceTree = ""; }; - 0856CE9B14A99EF0000B1711 /* ctl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ctl.h; sourceTree = ""; }; - 0856CE9C14A99EF0000B1711 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = ""; }; - 0856CE9D14A99EF0000B1711 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = ""; }; - 0856CE9E14A99EF0000B1711 /* icmp_var.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icmp_var.h; sourceTree = ""; }; - 0856CE9F14A99EF0000B1711 /* if.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = if.c; sourceTree = ""; }; - 0856CEA014A99EF0000B1711 /* if.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = if.h; sourceTree = ""; }; - 0856CEA114A99EF0000B1711 /* ip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ip.h; sourceTree = ""; }; - 0856CEA214A99EF0000B1711 /* ip_icmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ip_icmp.c; sourceTree = ""; }; - 0856CEA314A99EF0000B1711 /* ip_icmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ip_icmp.h; sourceTree = ""; }; - 0856CEA414A99EF0000B1711 /* ip_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ip_input.c; sourceTree = ""; }; - 0856CEA514A99EF0000B1711 /* ip_output.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ip_output.c; sourceTree = ""; }; - 0856CEA614A99EF0000B1711 /* libslirp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libslirp.h; sourceTree = ""; }; - 0856CEA714A99EF0000B1711 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = ""; }; - 0856CEA814A99EF0000B1711 /* mbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mbuf.c; sourceTree = ""; }; - 0856CEA914A99EF0000B1711 /* mbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mbuf.h; sourceTree = ""; }; - 0856CEAA14A99EF0000B1711 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = ""; }; - 0856CEAB14A99EF0000B1711 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; - 0856CEAC14A99EF0000B1711 /* sbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sbuf.c; sourceTree = ""; }; - 0856CEAD14A99EF0000B1711 /* sbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sbuf.h; sourceTree = ""; }; - 0856CEAE14A99EF0000B1711 /* slirp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = slirp.c; sourceTree = ""; }; - 0856CEAF14A99EF0000B1711 /* slirp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slirp.h; sourceTree = ""; }; - 0856CEB014A99EF0000B1711 /* slirp_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slirp_config.h; sourceTree = ""; }; - 0856CEB114A99EF0000B1711 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = ""; }; - 0856CEB214A99EF0000B1711 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = ""; }; - 0856CEB314A99EF0000B1711 /* tcp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcp.h; sourceTree = ""; }; - 0856CEB414A99EF0000B1711 /* tcp_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_input.c; sourceTree = ""; }; - 0856CEB514A99EF0000B1711 /* tcp_output.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_output.c; sourceTree = ""; }; - 0856CEB614A99EF0000B1711 /* tcp_subr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_subr.c; sourceTree = ""; }; - 0856CEB714A99EF0000B1711 /* tcp_timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tcp_timer.c; sourceTree = ""; }; - 0856CEB814A99EF0000B1711 /* tcp_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcp_timer.h; sourceTree = ""; }; - 0856CEB914A99EF0000B1711 /* tcp_var.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcp_var.h; sourceTree = ""; }; - 0856CEBA14A99EF0000B1711 /* tcpip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcpip.h; sourceTree = ""; }; - 0856CEBB14A99EF0000B1711 /* tftp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tftp.c; sourceTree = ""; }; - 0856CEBC14A99EF0000B1711 /* tftp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tftp.h; sourceTree = ""; }; - 0856CEBD14A99EF0000B1711 /* udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = udp.c; sourceTree = ""; }; - 0856CEBE14A99EF0000B1711 /* udp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = udp.h; sourceTree = ""; }; - 0856CEBF14A99EF0000B1711 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = ""; }; 0856CEC014A99EF0000B1711 /* sony.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sony.cpp; path = ../sony.cpp; sourceTree = SOURCE_ROOT; }; 0856CEC114A99EF0000B1711 /* thunks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = thunks.cpp; path = ../thunks.cpp; sourceTree = SOURCE_ROOT; }; 0856CEC214A99EF0000B1711 /* timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = timer.cpp; path = ../timer.cpp; sourceTree = SOURCE_ROOT; }; @@ -345,7 +302,6 @@ 0856CF7714A99EF0000B1711 /* user_strings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = user_strings.cpp; path = ../user_strings.cpp; sourceTree = SOURCE_ROOT; }; 0856CF7814A99EF0000B1711 /* video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video.cpp; path = ../video.cpp; sourceTree = SOURCE_ROOT; }; 0856CFC014A99EF0000B1711 /* xpram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xpram.cpp; path = ../xpram.cpp; sourceTree = SOURCE_ROOT; }; - 0856D17414A9A1A2000B1711 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; }; 0856D21414A9A6C6000B1711 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 0856D30814A9A704000B1711 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/VMSettingsWindow.nib; sourceTree = ""; }; 0856D31114A9A704000B1711 /* VMSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMSettingsController.h; sourceTree = ""; }; @@ -374,11 +330,58 @@ 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; A7B1921218C35D4700791D8D /* DiskType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskType.h; sourceTree = ""; }; A7B1921318C35D4700791D8D /* DiskType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DiskType.m; sourceTree = ""; }; + E413A40220CF7E6D00FBE967 /* video_sdl2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video_sdl2.cpp; path = ../../../BasiliskII/src/SDL/video_sdl2.cpp; sourceTree = ""; }; + E41936C020CFE608003A7654 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = ../../../../../../Library/Frameworks/SDL.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 = ""; }; + 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 = ""; }; + E44C45DC20D262AD000583AE /* tftp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tftp.c; path = ../../../BasiliskII/src/slirp/tftp.c; sourceTree = ""; }; + E44C45DD20D262AD000583AE /* mbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mbuf.c; path = ../../../BasiliskII/src/slirp/mbuf.c; sourceTree = ""; }; + E44C45DE20D262AD000583AE /* tftp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tftp.h; path = ../../../BasiliskII/src/slirp/tftp.h; sourceTree = ""; }; + E44C45DF20D262AD000583AE /* ip_icmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ip_icmp.c; path = ../../../BasiliskII/src/slirp/ip_icmp.c; sourceTree = ""; }; + E44C45E020D262AE000583AE /* bootp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bootp.h; path = ../../../BasiliskII/src/slirp/bootp.h; sourceTree = ""; }; + E44C45E120D262AE000583AE /* tcpip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tcpip.h; path = ../../../BasiliskII/src/slirp/tcpip.h; sourceTree = ""; }; + E44C45E220D262AE000583AE /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = VERSION; path = ../../../BasiliskII/src/slirp/VERSION; sourceTree = ""; }; + E44C45E320D262AE000583AE /* ip_icmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ip_icmp.h; path = ../../../BasiliskII/src/slirp/ip_icmp.h; sourceTree = ""; }; + E44C45E420D262AE000583AE /* slirp_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slirp_config.h; path = ../../../BasiliskII/src/slirp/slirp_config.h; sourceTree = ""; }; + E44C45E520D262AE000583AE /* tcp_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tcp_input.c; path = ../../../BasiliskII/src/slirp/tcp_input.c; sourceTree = ""; }; + E44C45E620D262AE000583AE /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = misc.c; path = ../../../BasiliskII/src/slirp/misc.c; sourceTree = ""; }; + E44C45E720D262AE000583AE /* udp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = udp.h; path = ../../../BasiliskII/src/slirp/udp.h; sourceTree = ""; }; + E44C45E820D262AE000583AE /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = main.h; path = ../../../BasiliskII/src/slirp/main.h; sourceTree = ""; }; + E44C45E920D262AE000583AE /* debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = debug.c; path = ../../../BasiliskII/src/slirp/debug.c; sourceTree = ""; }; + E44C45EA20D262AE000583AE /* tcp_subr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tcp_subr.c; path = ../../../BasiliskII/src/slirp/tcp_subr.c; sourceTree = ""; }; + E44C45EB20D262AE000583AE /* udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = udp.c; path = ../../../BasiliskII/src/slirp/udp.c; sourceTree = ""; }; + E44C45EC20D262AE000583AE /* mbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mbuf.h; path = ../../../BasiliskII/src/slirp/mbuf.h; sourceTree = ""; }; + E44C45ED20D262AE000583AE /* sbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sbuf.c; path = ../../../BasiliskII/src/slirp/sbuf.c; sourceTree = ""; }; + E44C45EE20D262AE000583AE /* ctl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ctl.h; path = ../../../BasiliskII/src/slirp/ctl.h; sourceTree = ""; }; + E44C45EF20D262AE000583AE /* slirp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slirp.h; path = ../../../BasiliskII/src/slirp/slirp.h; sourceTree = ""; }; + E44C45F020D262AE000583AE /* COPYRIGHT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYRIGHT; path = ../../../BasiliskII/src/slirp/COPYRIGHT; sourceTree = ""; }; + E44C45F120D262AE000583AE /* slirp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = slirp.c; path = ../../../BasiliskII/src/slirp/slirp.c; sourceTree = ""; }; + E44C45F220D262AE000583AE /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../../../BasiliskII/src/slirp/socket.h; sourceTree = ""; }; + E44C45F320D262AF000583AE /* if.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = if.h; path = ../../../BasiliskII/src/slirp/if.h; sourceTree = ""; }; + E44C45F420D262AF000583AE /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../../BasiliskII/src/slirp/misc.h; sourceTree = ""; }; + E44C45F520D262AF000583AE /* tcp_timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tcp_timer.c; path = ../../../BasiliskII/src/slirp/tcp_timer.c; sourceTree = ""; }; + E44C45F620D262AF000583AE /* sbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sbuf.h; path = ../../../BasiliskII/src/slirp/sbuf.h; sourceTree = ""; }; + E44C45F720D262AF000583AE /* tcp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tcp.h; path = ../../../BasiliskII/src/slirp/tcp.h; sourceTree = ""; }; + E44C45F820D262AF000583AE /* ip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ip.h; path = ../../../BasiliskII/src/slirp/ip.h; sourceTree = ""; }; + E44C45F920D262AF000583AE /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../../../BasiliskII/src/slirp/debug.h; sourceTree = ""; }; + E44C45FA20D262AF000583AE /* tcp_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tcp_timer.h; path = ../../../BasiliskII/src/slirp/tcp_timer.h; sourceTree = ""; }; + E44C45FB20D262AF000583AE /* tcp_var.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tcp_var.h; path = ../../../BasiliskII/src/slirp/tcp_var.h; sourceTree = ""; }; + E44C45FC20D262AF000583AE /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket.c; path = ../../../BasiliskII/src/slirp/socket.c; sourceTree = ""; }; + E44C45FD20D262AF000583AE /* libslirp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libslirp.h; path = ../../../BasiliskII/src/slirp/libslirp.h; sourceTree = ""; }; + E44C45FE20D262AF000583AE /* icmp_var.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = icmp_var.h; path = ../../../BasiliskII/src/slirp/icmp_var.h; sourceTree = ""; }; + E44C45FF20D262AF000583AE /* bootp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bootp.c; path = ../../../BasiliskII/src/slirp/bootp.c; sourceTree = ""; }; + E44C460020D262AF000583AE /* ip_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ip_input.c; path = ../../../BasiliskII/src/slirp/ip_input.c; sourceTree = ""; }; + E44C460120D262AF000583AE /* ip_output.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ip_output.c; path = ../../../BasiliskII/src/slirp/ip_output.c; sourceTree = ""; }; + E44C460220D262AF000583AE /* if.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = if.c; path = ../../../BasiliskII/src/slirp/if.c; sourceTree = ""; }; + E44C460320D262AF000583AE /* cksum.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cksum.c; path = ../../../BasiliskII/src/slirp/cksum.c; sourceTree = ""; }; + E44C460420D262AF000583AE /* tcp_output.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tcp_output.c; path = ../../../BasiliskII/src/slirp/tcp_output.c; sourceTree = ""; }; E456E2AC20C82B60006C8DC2 /* clip_macosx64.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = clip_macosx64.mm; sourceTree = ""; }; E4C9A03D1FD55CDC00CABBF9 /* basic-dyngen-ops-x86_64_macos.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = "basic-dyngen-ops-x86_64_macos.hpp"; path = "dyngen_precompiled/basic-dyngen-ops-x86_64_macos.hpp"; sourceTree = ""; }; E4C9A03F1FD55CE700CABBF9 /* ppc-dyngen-ops-x86_64_macos.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = "ppc-dyngen-ops-x86_64_macos.hpp"; path = "dyngen_precompiled/ppc-dyngen-ops-x86_64_macos.hpp"; sourceTree = ""; }; + E4CBF46020CFC451009F40CC /* video_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video_sdl.cpp; path = ../../../BasiliskII/src/SDL/video_sdl.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -400,7 +403,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0856D17514A9A1A2000B1711 /* SDL.framework in Frameworks */, + E420910120D0C4FA0094654F /* SDL2.framework in Frameworks */, 0856D21514A9A6C6000B1711 /* IOKit.framework in Frameworks */, 08CD42DC14B7B85B009CA2A2 /* Cocoa.framework in Frameworks */, 08CD42E814B7B8AA009CA2A2 /* Carbon.framework in Frameworks */, @@ -735,9 +738,10 @@ children = ( 0856CE9014A99EF0000B1711 /* audio_sdl.cpp */, 0856CE9114A99EF0000B1711 /* keycodes */, - 0856CE9214A99EF0000B1711 /* SDLMain.h */, - 0856CE9314A99EF0000B1711 /* SDLMain.m */, - 0856CE9414A99EF0000B1711 /* video_sdl.cpp */, + E41936C220CFE64D003A7654 /* SDLMain.h */, + E41936C320CFE64D003A7654 /* SDLMain.m */, + E4CBF46020CFC451009F40CC /* video_sdl.cpp */, + E413A40220CF7E6D00FBE967 /* video_sdl2.cpp */, ); name = SDL; path = ../SDL; @@ -746,47 +750,47 @@ 0856CE9614A99EF0000B1711 /* slirp */ = { isa = PBXGroup; children = ( - 0856CE9714A99EF0000B1711 /* bootp.c */, - 0856CE9814A99EF0000B1711 /* bootp.h */, - 0856CE9914A99EF0000B1711 /* cksum.c */, - 0856CE9A14A99EF0000B1711 /* COPYRIGHT */, - 0856CE9B14A99EF0000B1711 /* ctl.h */, - 0856CE9C14A99EF0000B1711 /* debug.c */, - 0856CE9D14A99EF0000B1711 /* debug.h */, - 0856CE9E14A99EF0000B1711 /* icmp_var.h */, - 0856CE9F14A99EF0000B1711 /* if.c */, - 0856CEA014A99EF0000B1711 /* if.h */, - 0856CEA114A99EF0000B1711 /* ip.h */, - 0856CEA214A99EF0000B1711 /* ip_icmp.c */, - 0856CEA314A99EF0000B1711 /* ip_icmp.h */, - 0856CEA414A99EF0000B1711 /* ip_input.c */, - 0856CEA514A99EF0000B1711 /* ip_output.c */, - 0856CEA614A99EF0000B1711 /* libslirp.h */, - 0856CEA714A99EF0000B1711 /* main.h */, - 0856CEA814A99EF0000B1711 /* mbuf.c */, - 0856CEA914A99EF0000B1711 /* mbuf.h */, - 0856CEAA14A99EF0000B1711 /* misc.c */, - 0856CEAB14A99EF0000B1711 /* misc.h */, - 0856CEAC14A99EF0000B1711 /* sbuf.c */, - 0856CEAD14A99EF0000B1711 /* sbuf.h */, - 0856CEAE14A99EF0000B1711 /* slirp.c */, - 0856CEAF14A99EF0000B1711 /* slirp.h */, - 0856CEB014A99EF0000B1711 /* slirp_config.h */, - 0856CEB114A99EF0000B1711 /* socket.c */, - 0856CEB214A99EF0000B1711 /* socket.h */, - 0856CEB314A99EF0000B1711 /* tcp.h */, - 0856CEB414A99EF0000B1711 /* tcp_input.c */, - 0856CEB514A99EF0000B1711 /* tcp_output.c */, - 0856CEB614A99EF0000B1711 /* tcp_subr.c */, - 0856CEB714A99EF0000B1711 /* tcp_timer.c */, - 0856CEB814A99EF0000B1711 /* tcp_timer.h */, - 0856CEB914A99EF0000B1711 /* tcp_var.h */, - 0856CEBA14A99EF0000B1711 /* tcpip.h */, - 0856CEBB14A99EF0000B1711 /* tftp.c */, - 0856CEBC14A99EF0000B1711 /* tftp.h */, - 0856CEBD14A99EF0000B1711 /* udp.c */, - 0856CEBE14A99EF0000B1711 /* udp.h */, - 0856CEBF14A99EF0000B1711 /* VERSION */, + E44C45FF20D262AF000583AE /* bootp.c */, + E44C45E020D262AE000583AE /* bootp.h */, + E44C460320D262AF000583AE /* cksum.c */, + E44C45F020D262AE000583AE /* COPYRIGHT */, + E44C45EE20D262AE000583AE /* ctl.h */, + E44C45E920D262AE000583AE /* debug.c */, + E44C45F920D262AF000583AE /* debug.h */, + E44C45FE20D262AF000583AE /* icmp_var.h */, + E44C460220D262AF000583AE /* if.c */, + E44C45F320D262AF000583AE /* if.h */, + E44C45DF20D262AD000583AE /* ip_icmp.c */, + E44C45E320D262AE000583AE /* ip_icmp.h */, + E44C460020D262AF000583AE /* ip_input.c */, + E44C460120D262AF000583AE /* ip_output.c */, + E44C45F820D262AF000583AE /* ip.h */, + E44C45FD20D262AF000583AE /* libslirp.h */, + E44C45E820D262AE000583AE /* main.h */, + E44C45DD20D262AD000583AE /* mbuf.c */, + E44C45EC20D262AE000583AE /* mbuf.h */, + E44C45E620D262AE000583AE /* misc.c */, + E44C45F420D262AF000583AE /* misc.h */, + E44C45ED20D262AE000583AE /* sbuf.c */, + E44C45F620D262AF000583AE /* sbuf.h */, + E44C45E420D262AE000583AE /* slirp_config.h */, + E44C45F120D262AE000583AE /* slirp.c */, + E44C45EF20D262AE000583AE /* slirp.h */, + E44C45FC20D262AF000583AE /* socket.c */, + E44C45F220D262AE000583AE /* socket.h */, + E44C45E520D262AE000583AE /* tcp_input.c */, + E44C460420D262AF000583AE /* tcp_output.c */, + E44C45EA20D262AE000583AE /* tcp_subr.c */, + E44C45F520D262AF000583AE /* tcp_timer.c */, + E44C45FA20D262AF000583AE /* tcp_timer.h */, + E44C45FB20D262AF000583AE /* tcp_var.h */, + E44C45F720D262AF000583AE /* tcp.h */, + E44C45E120D262AE000583AE /* tcpip.h */, + E44C45DC20D262AD000583AE /* tftp.c */, + E44C45DE20D262AD000583AE /* tftp.h */, + E44C45EB20D262AE000583AE /* udp.c */, + E44C45E720D262AE000583AE /* udp.h */, + E44C45E220D262AE000583AE /* VERSION */, ); name = slirp; path = ../slirp; @@ -869,10 +873,11 @@ 08CD42DF14B7B865009CA2A2 /* Frameworks */ = { isa = PBXGroup; children = ( + E420910020D0C4FA0094654F /* SDL2.framework */, + E41936C020CFE608003A7654 /* SDL.framework */, 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */, 08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */, 0856D21414A9A6C6000B1711 /* IOKit.framework */, - 0856D17414A9A1A2000B1711 /* SDL.framework */, ); name = Frameworks; sourceTree = ""; @@ -934,13 +939,13 @@ isa = PBXNativeTarget; buildConfigurationList = 0856CCC714A99E1D000B1711 /* Build configuration list for PBXNativeTarget "SheepShaver" */; buildPhases = ( - 0846E65E14B513DF00574779 /* Copy Frameworks */, 0856CCBD14A99E1C000B1711 /* Resources */, 0856CCBE14A99E1C000B1711 /* Sources */, 0856CCBF14A99E1C000B1711 /* Frameworks */, 082AC26A14AA5A5A00071F5E /* Run lowmem */, 08CD43CF14B7BD01009CA2A2 /* Change SDL load path */, 08CD3F3214B665E1009CA2A2 /* Preprocess Info.plist */, + E413A40820CF7EF800FBE967 /* Embed Frameworks */, ); buildRules = ( ); @@ -988,7 +993,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E44C460820D262B0000583AE /* VERSION in Resources */, 0856D05914A99EF1000B1711 /* SheepShaver.icns in Resources */, + E44C460F20D262B0000583AE /* COPYRIGHT in Resources */, 0856D33514A9A704000B1711 /* VMSettingsWindow.nib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1074,11 +1081,16 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E44C460B20D262B0000583AE /* debug.c in Sources */, + E44C460C20D262B0000583AE /* tcp_subr.c in Sources */, 0856CFC114A99EF0000B1711 /* adb.cpp in Sources */, + E44C461520D262B0000583AE /* ip_output.c in Sources */, 0856CFC214A99EF0000B1711 /* audio.cpp in Sources */, 0856CFE214A99EF0000B1711 /* cdrom.cpp in Sources */, + E44C461820D262B0000583AE /* tcp_output.c in Sources */, 0856CFE614A99EF0000B1711 /* disk.cpp in Sources */, 0856CFEC14A99EF0000B1711 /* scsi_dummy.cpp in Sources */, + E44C460E20D262B0000583AE /* sbuf.c in Sources */, 0856CFEE14A99EF0000B1711 /* emul_op.cpp in Sources */, 0856CFF014A99EF0000B1711 /* ether.cpp in Sources */, 0856CFF314A99EF0000B1711 /* extfs.cpp in Sources */, @@ -1086,58 +1098,54 @@ 0856D00914A99EF0000B1711 /* macos_util.cpp in Sources */, 0856D02514A99EF0000B1711 /* extfs_macosx.cpp in Sources */, 0856D05014A99EF1000B1711 /* prefs_macosx.mm in Sources */, + E44C461620D262B0000583AE /* if.c in Sources */, 0856D05A14A99EF1000B1711 /* sys_darwin.cpp in Sources */, + E44C460520D262B0000583AE /* tftp.c in Sources */, 0856D05B14A99EF1000B1711 /* main.cpp in Sources */, + E44C460A20D262B0000583AE /* misc.c in Sources */, + E44C461120D262B0000583AE /* tcp_timer.c in Sources */, 0856D05C14A99EF1000B1711 /* name_registry.cpp in Sources */, E444DC1520C8F06700DD29C9 /* pict.c in Sources */, 0856D05D14A99EF1000B1711 /* prefs_items.cpp in Sources */, + E44C460D20D262B0000583AE /* udp.c in Sources */, + E44C461420D262B0000583AE /* ip_input.c in Sources */, + E44C461320D262B0000583AE /* bootp.c in Sources */, 0856D05E14A99EF1000B1711 /* prefs.cpp in Sources */, 0856D05F14A99EF1000B1711 /* rom_patches.cpp in Sources */, 0856D06014A99EF1000B1711 /* rsrc_patches.cpp in Sources */, 0856D06114A99EF1000B1711 /* scsi.cpp in Sources */, 0856D06214A99EF1000B1711 /* audio_sdl.cpp in Sources */, - 0856D06414A99EF1000B1711 /* SDLMain.m in Sources */, - 0856D06514A99EF1000B1711 /* video_sdl.cpp in Sources */, 0856D06614A99EF1000B1711 /* serial.cpp in Sources */, - 0856D06714A99EF1000B1711 /* bootp.c in Sources */, - 0856D06814A99EF1000B1711 /* cksum.c in Sources */, - 0856D06A14A99EF1000B1711 /* debug.c in Sources */, - 0856D06B14A99EF1000B1711 /* if.c in Sources */, - 0856D06C14A99EF1000B1711 /* ip_icmp.c in Sources */, - 0856D06D14A99EF1000B1711 /* ip_input.c in Sources */, - 0856D06E14A99EF1000B1711 /* ip_output.c in Sources */, - 0856D06F14A99EF1000B1711 /* mbuf.c in Sources */, - 0856D07014A99EF1000B1711 /* misc.c in Sources */, - 0856D07114A99EF1000B1711 /* sbuf.c in Sources */, - 0856D07214A99EF1000B1711 /* slirp.c in Sources */, - 0856D07314A99EF1000B1711 /* socket.c in Sources */, - 0856D07414A99EF1000B1711 /* tcp_input.c in Sources */, - 0856D07514A99EF1000B1711 /* tcp_output.c in Sources */, E456E2AD20C82B61006C8DC2 /* clip_macosx64.mm in Sources */, - 0856D07614A99EF1000B1711 /* tcp_subr.c in Sources */, - 0856D07714A99EF1000B1711 /* tcp_timer.c in Sources */, - 0856D07814A99EF1000B1711 /* tftp.c in Sources */, - 0856D07914A99EF1000B1711 /* udp.c in Sources */, 0856D07B14A99EF1000B1711 /* sony.cpp in Sources */, 0856D07C14A99EF1000B1711 /* thunks.cpp in Sources */, 0856D07D14A99EF1000B1711 /* timer.cpp in Sources */, 0856D07E14A99EF1000B1711 /* about_window_unix.cpp in Sources */, + E44C460720D262B0000583AE /* ip_icmp.c in Sources */, 0856D08714A99EF1000B1711 /* bincue_unix.cpp in Sources */, + E4CBF46120CFC451009F40CC /* video_sdl.cpp in Sources */, 0856D09814A99EF1000B1711 /* ether_unix.cpp in Sources */, 0856D0AA14A99EF1000B1711 /* main_unix.cpp in Sources */, + E413A40320CF7E6D00FBE967 /* video_sdl2.cpp in Sources */, 0856D10614A99EF1000B1711 /* prefs_unix.cpp in Sources */, 0856D10714A99EF1000B1711 /* rpc_unix.cpp in Sources */, 0856D10814A99EF1000B1711 /* serial_unix.cpp in Sources */, 0856D10C14A99EF1000B1711 /* sshpty.c in Sources */, 0856D10D14A99EF1000B1711 /* strlcpy.c in Sources */, 0856D10E14A99EF1000B1711 /* sys_unix.cpp in Sources */, + E44C461720D262B0000583AE /* cksum.c in Sources */, 0856D10F14A99EF1000B1711 /* timer_unix.cpp in Sources */, 0856D11114A99EF1000B1711 /* user_strings_unix.cpp in Sources */, + E44C461020D262B0000583AE /* slirp.c in Sources */, 0856D11614A99EF1000B1711 /* xpram_unix.cpp in Sources */, 0856D11714A99EF1000B1711 /* user_strings.cpp in Sources */, + E44C460920D262B0000583AE /* tcp_input.c in Sources */, 0856D11814A99EF1000B1711 /* video.cpp in Sources */, + E41936C420CFE64D003A7654 /* SDLMain.m in Sources */, + E44C461220D262B0000583AE /* socket.c in Sources */, 0856D13F14A99EF1000B1711 /* xpram.cpp in Sources */, 0856D33914A9A704000B1711 /* VMSettingsController.mm in Sources */, + E44C460620D262B0000583AE /* mbuf.c in Sources */, 082AC22D14AA52E900071F5E /* prefs_editor_dummy.cpp in Sources */, 0873A80214AC515D004F12B7 /* utils_macosx.mm in Sources */, 083E370C16EFE85000CCCA59 /* disk_sparsebundle.cpp in Sources */, @@ -1340,7 +1348,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - /Library/Frameworks/SDL.framework/Versions/A/Headers/, + /Library/Frameworks/SDL2.framework/Headers, ./config/, ../Unix, ../MacOSX/Launcher, @@ -1348,6 +1356,7 @@ ../kpx_cpu/src, ../kpx_cpu/include, ../include, + ../CrossPlatform, ); INFOPLIST_FILE = Info.plist.in; INFOPLIST_PREFIX_HEADER = ""; @@ -1396,7 +1405,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - /Library/Frameworks/SDL.framework/Versions/A/Headers/, + /Library/Frameworks/SDL2.framework/Headers, ./config/, ../Unix, ../MacOSX/Launcher, @@ -1404,6 +1413,7 @@ ../kpx_cpu/src, ../kpx_cpu/include, ../include, + ../CrossPlatform, ); INFOPLIST_EXPAND_BUILD_SETTINGS = NO; INFOPLIST_FILE = Info.plist.in; diff --git a/SheepShaver/src/Unix/main_unix.cpp b/SheepShaver/src/Unix/main_unix.cpp index da0dfabc..463ec7c2 100755 --- a/SheepShaver/src/Unix/main_unix.cpp +++ b/SheepShaver/src/Unix/main_unix.cpp @@ -734,9 +734,8 @@ int main(int argc, char **argv) // Parse command line arguments for (int i=1; i