diff --git a/README b/README index 9d27156..f52b768 100644 --- a/README +++ b/README @@ -1,4 +1,13 @@ -Executor has not been actively worked on for many years. +Executor is a Macintosh emulator that is able to run many ancient Mac +OS 680x0 binaries (System 6 era, early System 7) without using any +intellectual property from Apple Computer. + +Executor has not been actively worked on for many years. It is more +of a curiousity than anything practical; it does not run PowerPC +binaries, nor did it even run most System 7 applications. Unless you +have a particular application that you know works with Executor, or +just like emulation a lot, you probably don't want to spend any time +with Executor. Included are a bunch of auxiliarly files and miscellaneous front-ends. It's unlikely anything other than the Linux and win32 ports can be @@ -29,11 +38,6 @@ System Folder for Executor from the git repository and add that info next. In the meantime, if anyone is reading this and wants a copy of executor-aux-2.1pr16-1.i386.rpm, try messaging me (ctm) at github. -My email address is still , although ARDI itself is -defunct. I get a ridiculous amount of spam and will quite possibly -not see email addressed to me. - - If you're on an x86_64 based machine and you have the ability to compile 32-bit binaries, you should be able to build a copy of Executor by doing something like @@ -50,3 +54,19 @@ HOST_GCC = gcc to HOST_GCC = gcc -m32 + + +If you have SDL installed and would like to use +the SDL-based version of Executor, you can try: + + mkdir -p build/debug-linux-sdl + cd build/debug-linux-sdl + ../../util/configure.sh '--target=i486-linux' '--host=i486-linux' '--front-end=sdl' '--cflags=-fno-strict-aliasing -I/usr/X11R6/include -DNDEBUG -O0 -finline-functions -g -Wall -DRELEASE_INTERNAL -DERROR_SUPPORTED_MASK="(~0)"' '--root=../..' '--target-file-format=glibc' '--sound=sdl' '--syn68k-target=i486-linux-glibc' + make + +My email address is still , although ARDI itself is +defunct. I get a ridiculous amount of spam and will quite possibly +not see email addressed to me. I'm ctm on github (http://github.com) +and typically check my email there once a day. + +--Cliff Matthews diff --git a/TODO b/TODO index dc54321..b4a22ac 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,11 @@ -$Id: TODO 121 2005-11-21 21:12:16Z ctm $ + package up the System Folder and whatnot so that people w/o the + old executor-aux can run Executor + + Try building the mingw32 version using the mingw32 toolchain + for Fedora 11 (mingw32 has been done before) + + Try compiling a version for Mac OS X using SDL (Mac OS X hasn't been + done before, although NEXTSTEP has) Probably want to do an in-use / marked for deletion fix diff --git a/src/config/arch/i386/i386.h b/src/config/arch/i386/i386.h index bcc54a5..ae22786 100644 --- a/src/config/arch/i386/i386.h +++ b/src/config/arch/i386/i386.h @@ -26,7 +26,7 @@ #define SWAP16_FUNC_DEFN \ -static inline uint16 \ +extern inline uint16 \ swap16 (uint16 n) \ { \ return (n >> 8) | (n << 8); \ @@ -35,7 +35,7 @@ swap16 (uint16 n) \ #if defined (ALWAYS_ON_I486) #define SWAP32_FUNC_DEFN \ -static inline uint32 \ +extern inline uint32 \ swap32 (uint32 n) \ { \ /* We can use bswap on the i486, but never on the i386. */ \ @@ -44,7 +44,7 @@ swap32 (uint32 n) \ } #else /* !ALWAYS_ON_I486 */ #define SWAP32_FUNC_DEFN \ -static inline uint32 \ +extern inline uint32 \ swap32 (uint32 n) \ { \ __asm__ ("rorw $8,%w0\n\t" \ @@ -54,8 +54,8 @@ swap32 (uint32 n) \ } #endif /* !ALWAYS_ON_I486 */ -static inline uint16 swap16 (uint16 n) __attribute__((const)); -static inline uint32 swap32 (uint32 n) __attribute__((const)); +extern inline uint16 swap16 (uint16 n) __attribute__((const, always_inline)); +extern inline uint32 swap32 (uint32 n) __attribute__((const, always_inline)); SWAP16_FUNC_DEFN SWAP32_FUNC_DEFN diff --git a/src/sound.c b/src/sound.c index 0fc09c4..7e08774 100644 --- a/src/sound.c +++ b/src/sound.c @@ -525,6 +525,7 @@ BOOLEAN callasynth(SndChannelPtr chanp, SndCommand *cmdp, ModifierStubPtr mp) return CToPascalCall(MR(mp->code), CTOP_SectRect, chanp, cmdp, mp); } +#if defined(OLD_BROKEN_NEXTSTEP_SOUND) PRIVATE void recsndcmd(SndChannelPtr chanp, SndCommand *cmdp, ModifierStubPtr mp) { @@ -544,6 +545,7 @@ PRIVATE void recsndcmd(SndChannelPtr chanp, SndCommand *cmdp, } while (doanother); } } +#endif /* defined(OLD_BROKEN_NEXTSTEP_SOUND) */ static inline boolean_t diff --git a/src/stdfile.c b/src/stdfile.c index d16773a..181679c 100644 --- a/src/stdfile.c +++ b/src/stdfile.c @@ -2305,13 +2305,13 @@ PUBLIC void spfcommon(Point p, StringPtr prompt, StringPtr name, if (is_normal_dlgid (getorput, dig) && host_has_spfcommon ()) { host_spf_reply_block reply; char *c_prompt; - char *local_name; + char *local_name = "currently ignored"; c_prompt = cstring_from_str255 (prompt); #if 0 local_name = ...; #else -#warning TODO +#warning "TODO: support native file pickers" #endif reply_valid = host_spfcommon (&reply, c_prompt, local_name, &fp, &filef, numt, tl, getorput, flavor, activeList,