mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-09-29 06:54:33 +00:00
Add hacks to disable "floppy" & "serial[ab]" entries that would cause
Basilisk II to hang on MacOS X as an X11 build. I am not sure this is supposed to work in an Aqua build so I leave that enable there, assuming <AvailabilityMacros.h> is included somehow, thus defining MAC_OS_X_VERSION_* and friends.
This commit is contained in:
parent
46dc8c5391
commit
c04603adce
@ -145,8 +145,13 @@ void SysAddFloppyPrefs(void)
|
|||||||
PrefsAddString("floppy", "/dev/fd0a");
|
PrefsAddString("floppy", "/dev/fd0a");
|
||||||
PrefsAddString("floppy", "/dev/fd1a");
|
PrefsAddString("floppy", "/dev/fd1a");
|
||||||
#elif defined(__APPLE__) && defined(__MACH__)
|
#elif defined(__APPLE__) && defined(__MACH__)
|
||||||
|
// FIXME: We assume an Aqua build causes <AvailabilityMacros.h> to
|
||||||
|
// be included, thusly enabling this part of code that would cause
|
||||||
|
// Basilisk II to hang otherwise.
|
||||||
|
#ifdef MAC_OS_X_VERSION_10_0
|
||||||
PrefsAddString("floppy", "/dev/fd/0");
|
PrefsAddString("floppy", "/dev/fd/0");
|
||||||
PrefsAddString("floppy", "/dev/fd/1");
|
PrefsAddString("floppy", "/dev/fd/1");
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
PrefsAddString("floppy", "/dev/fd0");
|
PrefsAddString("floppy", "/dev/fd0");
|
||||||
PrefsAddString("floppy", "/dev/fd1");
|
PrefsAddString("floppy", "/dev/fd1");
|
||||||
@ -217,7 +222,7 @@ void SysAddCDROMPrefs(void)
|
|||||||
closedir(cd_dir);
|
closedir(cd_dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#elif defined(__APPLE__) && defined(__MACH__)
|
#elif defined(__APPLE__) && defined(__MACH__) && defined(MAC_OS_X_VERSION_10_0)
|
||||||
extern void DarwinAddCDROMPrefs(void);
|
extern void DarwinAddCDROMPrefs(void);
|
||||||
|
|
||||||
DarwinAddCDROMPrefs();
|
DarwinAddCDROMPrefs();
|
||||||
@ -248,8 +253,13 @@ void SysAddSerialPrefs(void)
|
|||||||
PrefsAddString("seriala", "/dev/tty00");
|
PrefsAddString("seriala", "/dev/tty00");
|
||||||
PrefsAddString("serialb", "/dev/tty01");
|
PrefsAddString("serialb", "/dev/tty01");
|
||||||
#elif defined(__APPLE__) && defined(__MACH__)
|
#elif defined(__APPLE__) && defined(__MACH__)
|
||||||
|
// FIXME: We assume an Aqua build causes <AvailabilityMacros.h> to
|
||||||
|
// be included, thusly enabling this part of code that would cause
|
||||||
|
// Basilisk II to hang otherwise.
|
||||||
|
#ifdef MAC_OS_X_VERSION_10_0
|
||||||
PrefsAddString("seriala", "/dev/ttys0");
|
PrefsAddString("seriala", "/dev/ttys0");
|
||||||
PrefsAddString("serialb", "/dev/ttys1");
|
PrefsAddString("serialb", "/dev/ttys1");
|
||||||
|
#endif
|
||||||
// PrefsAddString("seriala", "/dev/cu.modem");
|
// PrefsAddString("seriala", "/dev/cu.modem");
|
||||||
// PrefsAddString("serialb", "/dev/cu.IrDA-IrCOMMch-b");
|
// PrefsAddString("serialb", "/dev/cu.IrDA-IrCOMMch-b");
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user