diff options
| author | forsyth <forsyth@vitanuova.com> | 2012-05-07 13:08:02 +0100 |
|---|---|---|
| committer | forsyth <forsyth@vitanuova.com> | 2012-05-07 13:08:02 +0100 |
| commit | 8f1b8d8700778e788c4644f5ac368fcb46ffe574 (patch) | |
| tree | f650d2961b376b9ea375adf03d822882896b265f | |
| parent | a6b3238f419e5f5ccc08dd86121c357264e54987 (diff) | |
20120507-1307
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | emu/MacOSX/win.c | 35 | ||||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | mkfiles/mkfile-MacOSX-386 | 6 |
4 files changed, 9 insertions, 37 deletions
@@ -1,3 +1,6 @@ +20120507 + mkfiles/mkfile-MacOSX-386 change cc to gcc + emu/MacOSX/win.c null out drawcursor 20120424 utils/cc/Posix.c and utils/c2l/Posix.c: correct definition of mydup for POSIX dup/dup2 libbio/bprint.c error handling if flush or print fails diff --git a/emu/MacOSX/win.c b/emu/MacOSX/win.c index a49b4bc7..a2ec4ffa 100644 --- a/emu/MacOSX/win.c +++ b/emu/MacOSX/win.c @@ -730,37 +730,6 @@ setpointer(int x, int y) void drawcursor(Drawcursor* c) { - Cursor crsr; - uchar *bc, *bs, *ps, *pm; - int i, j, h, w, bpl; - - if(c->data == nil || c->minx >= c->maxx){ - InitCursor(); - return; - } - memset(crsr.data, 0, sizeof(crsr.data)); - memset(crsr.mask, 0, sizeof(crsr.mask)); - ps = (uchar*)crsr.data; - pm = (uchar*)crsr.mask; - h = (c->maxy - c->miny)/2; /* bounds include both masks, strangely */ - bpl = bytesperline(Rect(c->minx, c->miny, c->maxx, c->maxy), 1); - if((w = bpl) > 2) - w = 2; - bc = c->data; - bs = c->data + h*bpl; - if(h > 16) - h = 16; - for(i = 0; i < h; i++){ - for(j = 0; j < w; j++){ - ps[j] = bs[j]; - pm[j] = bs[j] | bc[j]; - } - bs += bpl; - bc += bpl; - ps += 2; - pm += 2; - } - crsr.hotSpot.h = -c->hotx; - crsr.hotSpot.v = -c->hoty; - SetCursor(&crsr); + USED(c); + /* removed, pending extensive change for newer MacOS X */ } diff --git a/include/version.h b/include/version.h index 165d7f94..deba09d0 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20120424)" +#define VERSION "Fourth Edition (20120507)" diff --git a/mkfiles/mkfile-MacOSX-386 b/mkfiles/mkfile-MacOSX-386 index 2101fe3a..ecbcf213 100644 --- a/mkfiles/mkfile-MacOSX-386 +++ b/mkfiles/mkfile-MacOSX-386 @@ -9,12 +9,12 @@ AR= ar ARFLAGS= ruvs A= a -AS= cc -c -arch i386 +AS= gcc -c -arch i386 ASFLAGS= ISYSROOT= -isysroot /Developer/SDKs/MacOSX10.4u.sdk -CC= cc -c +CC= gcc -c COPTFLAGS= -Os CDEBUGFLAGS= CTHREADFLAGS= @@ -29,7 +29,7 @@ CFLAGS= -arch i386\ -I$ROOT/include\ $COPTFLAGS $CDEBUGFLAGS\ -LD= cc -arch i386 +LD= gcc -arch i386 LDFLAGS=\ -mmacosx-version-min=10.4\ -multiply_defined suppress |