diff options
| author | Charles.Forsyth <devnull@localhost> | 2007-09-30 20:59:31 +0000 |
|---|---|---|
| committer | Charles.Forsyth <devnull@localhost> | 2007-09-30 20:59:31 +0000 |
| commit | 863c0c6c2683c193a106b12d568a9cd716190cef (patch) | |
| tree | a45cc5873207af32208abfa1c918f402121fc220 | |
| parent | 86393c201844da762b4a04ce97fc34a2c73f7d33 (diff) | |
20070930-2159
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | emu/MacOSX/NOTE | 4 | ||||
| -rw-r--r-- | emu/MacOSX/mkfile | 6 | ||||
| -rw-r--r-- | emu/MacOSX/mkfile-g | 4 | ||||
| -rw-r--r-- | include/version.h | 2 |
5 files changed, 11 insertions, 7 deletions
@@ -1,3 +1,5 @@ +20070929 + move emu/MacOSX/mkfile to .../mkfile-x11 and replace it by the variant that builds for Carbon, now the default 20070927 add working drawcursor to emu/MacOSX/win.c, based on mirtchovski's changes (but mapping general cursor images to Mac's form) 20070910 diff --git a/emu/MacOSX/NOTE b/emu/MacOSX/NOTE index 990d4ea3..b9f8748f 100644 --- a/emu/MacOSX/NOTE +++ b/emu/MacOSX/NOTE @@ -1,2 +1,4 @@ - still interp mode only, jit not complete -- uses X11R6 from Apple +- mkfile uses Carbon only; mkfile-x11 uses X11R6 from Apple +- both powerpc and x86 versions compiled from this source +- mkfile-g doesn't include graphics (uses emu-g not emu as configuration) diff --git a/emu/MacOSX/mkfile b/emu/MacOSX/mkfile index 25fb99c6..b077d95c 100644 --- a/emu/MacOSX/mkfile +++ b/emu/MacOSX/mkfile @@ -21,7 +21,7 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal OBJ=\ asm-$OBJTYPE.$O\ os.$O\ - win-x11a.$O\ + win.$O\ $CONF.root.$O\ lock.$O\ $DEVS\ @@ -35,14 +35,14 @@ CFLAGS='-DROOT="'$ROOT'"'\ -I$ROOT/$SYSTARG/$OBJTYPE/include\ -I$ROOT/include -I$ROOT/libinterp\ $CTHREADFLAGS $CFLAGS $EMUOPTIONS\ - -I/usr/X11R6/include KERNDATE=`{$NDATE} LDFLAGS=$LDFLAGS -L/usr/X11R6/lib SYSLIBS= \ - -lm -lX11 -lXext\ + -lm\ + -framework Carbon -framework QuickTime\ -lpthread\ -framework CoreFoundation\ -framework IOKit\ diff --git a/emu/MacOSX/mkfile-g b/emu/MacOSX/mkfile-g index 57f32781..b39d872f 100644 --- a/emu/MacOSX/mkfile-g +++ b/emu/MacOSX/mkfile-g @@ -1,8 +1,8 @@ SYSTARG=MacOSX -OBJTYPE=power +#OBJTYPE=power <../../mkconfig SYSTARG=MacOSX -OBJTYPE=power +#OBJTYPE=power #Configurable parameters diff --git a/include/version.h b/include/version.h index 1ba3f341..39c10cef 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20070927)" +#define VERSION "Fourth Edition (20070930)" |