Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactoring to handle crossplatform bincue support

This commit is contained in:
Seth Polsley 2020-07-05 23:54:53 -05:00
parent 23da9e72eb
commit 66a69dc79b
10 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
View File

@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
5D5C3B0A24B2DF3500CDAB41 /* bincue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D5C3B0924B2DF3400CDAB41 /* bincue.cpp */; };
5DDE95192255D076004D0E79 /* AudioDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDE95132255D076004D0E79 /* AudioDevice.cpp */; };
5DDE951A2255D076004D0E79 /* audio_macosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDE95152255D076004D0E79 /* audio_macosx.cpp */; };
5DDE951B2255D076004D0E79 /* MacOSX_sound_if.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDE95162255D076004D0E79 /* MacOSX_sound_if.cpp */; };
@ -56,7 +57,6 @@
7539E1E11F23B25A006B2DF2 /* user_strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E1221F23B25A006B2DF2 /* user_strings.cpp */; };
7539E1E21F23B25A006B2DF2 /* video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E1231F23B25A006B2DF2 /* video.cpp */; };
7539E1E31F23B25A006B2DF2 /* xpram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E1241F23B25A006B2DF2 /* xpram.cpp */; };
7539E23F1F23B32A006B2DF2 /* bincue_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E1F01F23B329006B2DF2 /* bincue_unix.cpp */; };
7539E24A1F23B32A006B2DF2 /* disk_sparsebundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E1FD1F23B32A006B2DF2 /* disk_sparsebundle.cpp */; };
7539E2681F23B32A006B2DF2 /* rpc_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7539E2241F23B32A006B2DF2 /* rpc_unix.cpp */; };
7539E26C1F23B32A006B2DF2 /* sshpty.c in Sources */ = {isa = PBXBuildFile; fileRef = 7539E22A1F23B32A006B2DF2 /* sshpty.c */; };
@ -122,6 +122,8 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
5D5C3B0924B2DF3400CDAB41 /* bincue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bincue.cpp; path = ../bincue.cpp; sourceTree = "<group>"; };
5D5C3B0B24B2DF4200CDAB41 /* bincue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bincue.h; sourceTree = "<group>"; };
5DDE95122255D075004D0E79 /* AudioBackEnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioBackEnd.h; sourceTree = "<group>"; };
5DDE95132255D076004D0E79 /* AudioDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioDevice.cpp; sourceTree = "<group>"; };
5DDE95142255D076004D0E79 /* AudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioDevice.h; sourceTree = "<group>"; };
@ -243,8 +245,6 @@
7539E1221F23B25A006B2DF2 /* user_strings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = user_strings.cpp; path = ../user_strings.cpp; sourceTree = "<group>"; };
7539E1231F23B25A006B2DF2 /* video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video.cpp; path = ../video.cpp; sourceTree = "<group>"; };
7539E1241F23B25A006B2DF2 /* xpram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xpram.cpp; path = ../xpram.cpp; sourceTree = "<group>"; };
7539E1F01F23B329006B2DF2 /* bincue_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bincue_unix.cpp; sourceTree = "<group>"; };
7539E1F11F23B329006B2DF2 /* bincue_unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bincue_unix.h; sourceTree = "<group>"; };
7539E1F81F23B329006B2DF2 /* gtk-osx.patch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "gtk-osx.patch"; sourceTree = "<group>"; };
7539E1FA1F23B32A006B2DF2 /* mkstandalone */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = mkstandalone; sourceTree = "<group>"; };
7539E1FC1F23B32A006B2DF2 /* testlmem.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = testlmem.sh; sourceTree = "<group>"; };
@ -417,6 +417,16 @@
path = ../slirp;
sourceTree = "<group>";
};
5D5C3B0824B2DEDF00CDAB41 /* Recovered References */ = {
isa = PBXGroup;
children = (
5DDE95212255D0C2004D0E79 /* AudioUnit.framework */,
5DDE951F2255D0B6004D0E79 /* AudioToolbox.framework */,
5DDE951D2255D0A9004D0E79 /* CoreAudio.framework */,
);
name = "Recovered References";
sourceTree = "<group>";
};
752F26F71F240E51001032B4 /* Frameworks */ = {
isa = PBXGroup;
children = (
@ -459,6 +469,7 @@
753252FF1F535E5D0024025B /* generated src */,
7539DFB31F23B17E006B2DF2 /* Products */,
752F26F71F240E51001032B4 /* Frameworks */,
5D5C3B0824B2DEDF00CDAB41 /* Recovered References */,
);
sourceTree = "<group>";
};
@ -492,6 +503,7 @@
7539DFD91F23B25A006B2DF2 /* adb.h */,
7539DFDA1F23B25A006B2DF2 /* audio.h */,
7539DFDB1F23B25A006B2DF2 /* audio_defs.h */,
5D5C3B0B24B2DF4200CDAB41 /* bincue.h */,
7539DFDC1F23B25A006B2DF2 /* cdrom.h */,
7539DFDD1F23B25A006B2DF2 /* clip.h */,
7539DFDE1F23B25A006B2DF2 /* debug.h */,
@ -634,6 +646,7 @@
children = (
7539DFC91F23B25A006B2DF2 /* adb.cpp */,
7539DFCA1F23B25A006B2DF2 /* audio.cpp */,
5D5C3B0924B2DF3400CDAB41 /* bincue.cpp */,
7539DFCB1F23B25A006B2DF2 /* cdrom.cpp */,
7539DFCC1F23B25A006B2DF2 /* CrossPlatform */,
7539DFD41F23B25A006B2DF2 /* disk.cpp */,
@ -669,8 +682,6 @@
7539E1E91F23B329006B2DF2 /* Unix */ = {
isa = PBXGroup;
children = (
7539E1F01F23B329006B2DF2 /* bincue_unix.cpp */,
7539E1F11F23B329006B2DF2 /* bincue_unix.h */,
7539E1F71F23B329006B2DF2 /* Darwin */,
7539E1FD1F23B32A006B2DF2 /* disk_sparsebundle.cpp */,
7539E1FE1F23B32A006B2DF2 /* disk_unix.h */,
@ -866,6 +877,7 @@
5DDE951C2255D076004D0E79 /* AudioBackEnd.cpp in Sources */,
7539E2701F23B32A006B2DF2 /* tinyxml2.cpp in Sources */,
7539E1721F23B25A006B2DF2 /* rsrc_patches.cpp in Sources */,
5D5C3B0A24B2DF3500CDAB41 /* bincue.cpp in Sources */,
7539E2931F23C56F006B2DF2 /* serial_dummy.cpp in Sources */,
7539E1981F23B25A006B2DF2 /* exceptions.cpp in Sources */,
75CBCF771F5DB65E00830063 /* video_sdl.cpp in Sources */,
@ -928,7 +940,6 @@
7539E2681F23B32A006B2DF2 /* rpc_unix.cpp in Sources */,
E413D92F20D260BC00E437D8 /* bootp.c in Sources */,
7539E2911F23C56F006B2DF2 /* prefs_editor_dummy.cpp in Sources */,
7539E23F1F23B32A006B2DF2 /* bincue_unix.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
BasiliskII/src/SDL/audio_sdl.cpp
View File

@ -34,7 +34,7 @@
#include "debug.h"
#if defined(BINCUE)
#include "bincue_unix.h"
#include "bincue.h"
#endif

2
BasiliskII/src/Unix/sys_unix.cpp
View File

@ -59,7 +59,7 @@
#include "disk_unix.h"
#if defined(BINCUE)
#include "bincue_unix.h"
#include "bincue.h"
#endif

2
BasiliskII/src/Unix/bincue_unix.cpp → BasiliskII/src/bincue.cpp
View File

@ -53,7 +53,7 @@ static int bincue_core_audio_callback(void);
#include <SDL_audio.h>
#endif
#include "bincue_unix.h"
#include "bincue.h"
#define DEBUG 0
#include "debug.h"

2
BasiliskII/src/Unix/bincue_unix.h → BasiliskII/src/include/bincue.h
View File

@ -1,5 +1,5 @@
/*
* bincue_unix.h -- support for cdrom image files in bin/cue format
* bincue.h -- support for cdrom image files in bin/cue format
*
* (C) 2010 Geoffrey Brown
*

16
SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj
View File

@ -76,9 +76,9 @@
08CD42DC14B7B85B009CA2A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */; };
08CD42E814B7B8AA009CA2A2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */; };
3D2C25B5221092BA00B635DE /* SheepVM.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3D2C25B4221092BA00B635DE /* SheepVM.icns */; };
5D2143D324B2DD81008BB372 /* bincue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D2143D224B2DD81008BB372 /* bincue.cpp */; };
5D2143D524B2DD90008BB372 /* bincue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D2143D424B2DD90008BB372 /* bincue.h */; };
5D55CB40225584D000FF8E81 /* cdrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D55CB3F225584D000FF8E81 /* cdrom.cpp */; };
5D55CB432255B4FE00FF8E81 /* bincue_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D55CB422255B4FD00FF8E81 /* bincue_unix.cpp */; };
5D55CB452255B50E00FF8E81 /* bincue_unix.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D55CB442255B50E00FF8E81 /* bincue_unix.h */; };
5DDE94F92255C70C004D0E79 /* MacOSX_sound_if.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DDE94F82255C70C004D0E79 /* MacOSX_sound_if.h */; };
5DDE94FB2255C712004D0E79 /* MacOSX_sound_if.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDE94FA2255C712004D0E79 /* MacOSX_sound_if.cpp */; };
5DDE94FC2255C712004D0E79 /* MacOSX_sound_if.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDE94FA2255C712004D0E79 /* MacOSX_sound_if.cpp */; };
@ -337,10 +337,10 @@
08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
08CD42E714B7B8AA009CA2A2 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
3D2C25B4221092BA00B635DE /* SheepVM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SheepVM.icns; sourceTree = "<group>"; };
5D2143D224B2DD81008BB372 /* bincue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bincue.cpp; path = ../bincue.cpp; sourceTree = "<group>"; };
5D2143D424B2DD90008BB372 /* bincue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bincue.h; sourceTree = "<group>"; };
5D3967BF2328D315003925D6 /* adb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adb.cpp; path = ../../../BasiliskII/src/adb.cpp; sourceTree = "<group>"; };
5D55CB3F225584D000FF8E81 /* cdrom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cdrom.cpp; path = ../../../BasiliskII/src/cdrom.cpp; sourceTree = "<group>"; };
5D55CB422255B4FD00FF8E81 /* bincue_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bincue_unix.cpp; path = ../../../BasiliskII/src/Unix/bincue_unix.cpp; sourceTree = "<group>"; };
5D55CB442255B50E00FF8E81 /* bincue_unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bincue_unix.h; path = ../../../BasiliskII/src/Unix/bincue_unix.h; sourceTree = "<group>"; };
5DDE94F82255C70C004D0E79 /* MacOSX_sound_if.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MacOSX_sound_if.h; path = ../../../BasiliskII/src/MacOSX/MacOSX_sound_if.h; sourceTree = "<group>"; };
5DDE94FA2255C712004D0E79 /* MacOSX_sound_if.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MacOSX_sound_if.cpp; path = ../../../BasiliskII/src/MacOSX/MacOSX_sound_if.cpp; sourceTree = "<group>"; };
5DDE94FD2255C740004D0E79 /* AudioBackEnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioBackEnd.h; path = ../../../BasiliskII/src/MacOSX/AudioBackEnd.h; sourceTree = "<group>"; };
@ -488,6 +488,7 @@
087B91B11B780EC900825F7F /* CrossPlatform */,
5D3967BF2328D315003925D6 /* adb.cpp */,
5DF4CB7E22B5BD5D00512A86 /* audio.cpp */,
5D2143D224B2DD81008BB372 /* bincue.cpp */,
5D55CB3F225584D000FF8E81 /* cdrom.cpp */,
0856CD7D14A99EEF000B1711 /* disk.cpp */,
0856CD7E14A99EEF000B1711 /* dummy */,
@ -539,6 +540,7 @@
0856CD9014A99EEF000B1711 /* adb.h */,
0856CD9114A99EEF000B1711 /* audio.h */,
0856CD9214A99EEF000B1711 /* audio_defs.h */,
5D2143D424B2DD90008BB372 /* bincue.h */,
0856CD9314A99EEF000B1711 /* cdrom.h */,
0856CD9414A99EEF000B1711 /* clip.h */,
0856CD9514A99EEF000B1711 /* cpu_emulation.h */,
@ -841,8 +843,6 @@
08003F841E0624BD00A3ADAB /* dyngen_precompiled */,
082AC25614AA59DA00071F5E /* Darwin */,
0856CEC414A99EF0000B1711 /* about_window_unix.cpp */,
5D55CB422255B4FD00FF8E81 /* bincue_unix.cpp */,
5D55CB442255B50E00FF8E81 /* bincue_unix.h */,
083E370A16EFE85000CCCA59 /* disk_sparsebundle.cpp */,
083E370B16EFE85000CCCA59 /* disk_unix.h */,
0856CEE314A99EF0000B1711 /* ether_unix.cpp */,
@ -950,10 +950,10 @@
5DDE94F92255C70C004D0E79 /* MacOSX_sound_if.h in Headers */,
08003F8E1E0624D100A3ADAB /* basic-dyngen-ops.hpp in Headers */,
E4C9A03E1FD55CDC00CABBF9 /* basic-dyngen-ops-x86_64_macos.hpp in Headers */,
5D2143D524B2DD90008BB372 /* bincue.h in Headers */,
E4C9A0401FD55CE700CABBF9 /* ppc-dyngen-ops-x86_64_macos.hpp in Headers */,
5DDE950C2255C896004D0E79 /* AudioBackEnd.h in Headers */,
5DDE950F2255C8B4004D0E79 /* audio_defs_macosx.h in Headers */,
5D55CB452255B50E00FF8E81 /* bincue_unix.h in Headers */,
5DDE94FE2255C740004D0E79 /* AudioBackEnd.h in Headers */,
08163339158C121000C449F9 /* dis-asm.h in Headers */,
08003F8C1E0624D100A3ADAB /* basic-dyngen-ops-x86_32.hpp in Headers */,
@ -1167,6 +1167,7 @@
0856D10E14A99EF1000B1711 /* sys_unix.cpp in Sources */,
E44C461720D262B0000583AE /* cksum.c in Sources */,
0856D10F14A99EF1000B1711 /* timer_unix.cpp in Sources */,
5D2143D324B2DD81008BB372 /* bincue.cpp in Sources */,
0856D11114A99EF1000B1711 /* user_strings_unix.cpp in Sources */,
E44C461020D262B0000583AE /* slirp.c in Sources */,
0856D11614A99EF1000B1711 /* xpram_unix.cpp in Sources */,
@ -1174,7 +1175,6 @@
0856D11714A99EF1000B1711 /* user_strings.cpp in Sources */,
E44C460920D262B0000583AE /* tcp_input.c in Sources */,
0856D11814A99EF1000B1711 /* video.cpp in Sources */,
5D55CB432255B4FE00FF8E81 /* bincue_unix.cpp in Sources */,
E41936C420CFE64D003A7654 /* SDLMain.m in Sources */,
E44C461220D262B0000583AE /* socket.c in Sources */,
0856D13F14A99EF1000B1711 /* xpram.cpp in Sources */,

1
SheepShaver/src/Unix/bincue_unix.cpp
View File

@ -1 +0,0 @@
../../../BasiliskII/src/Unix/bincue_unix.cpp

1
SheepShaver/src/Unix/bincue_unix.h
View File

@ -1 +0,0 @@
../../../BasiliskII/src/Unix/bincue_unix.h

1
SheepShaver/src/bincue.cpp Symbolic link
View File

@ -0,0 +1 @@
../../BasiliskII/src/bincue.cpp

1
SheepShaver/src/include/bincue.h Symbolic link
View File

@ -0,0 +1 @@
../../../BasiliskII/src/include/bincue.h