plato: more Makefile hacking and a bug fix

diff --git a/Applications/plato/Makefile.6502 b/Applications/plato/Makefile.6502
index f13b2e6..23f35d4 100644 (file)
--- a/Applications/plato/Makefile.6502
+++ b/Applications/plato/Makefile.6502
@@ -17,14 +17,20 @@ FSRCS = fuzix/font.c fuzix/io.c fuzix/keyboard.c fuzix/scale.c fuzix/screen.c \
 
 INC = io.h keyboard.h plato_key.h protocol.h screen.h terminal.h touch.h
 
-OBJS = $(SRCS:.c=.rel)
-FOBJS = $(patsubst fuzix/%.c,%.rel, $(FSRCS))
+OBJS = $(SRCS:.c=.o)
+FOBJS = $(patsubst fuzix/%.c,%.o, $(FSRCS))
 
 all:    plato
 
 plato: $(OBJS) $(FOBJS)
        $(LINKER) -o $@ $(LINKER_OPT) $(CRT0) $^ c6502.lib -m $@.map
 
+$(OBJS): %.o: %.c
+       $(CC) $(COPT) $(CFLAGS) -c $< -o $@
+
+$(FOBJS): %.o: fuzix/%.c
+       $(CC) $(COPT) $(CFLAGS) -c $< -o $@
+
 $(OBJS) : $(INC)
 
 $(FOBJS) : $(INC)

diff --git a/Applications/plato/Makefile.68000 b/Applications/plato/Makefile.68000
index b70af16..0122fb4 100644 (file)
--- a/Applications/plato/Makefile.68000
+++ b/Applications/plato/Makefile.68000
@@ -28,15 +28,14 @@ OBJS = $(SRCS:.c=.o)
 FOBJS = $(patsubst fuzix/%.c,%.o, $(FSRCS))
 
 plato: $(OBJS) $(FOBJS)
-       $(LINKER) $(LINKER_OPT) -o sccz80 $(OBJS) $(FOBJS)
+       $(LINKER) $(LINKER_OPT) -o plato $(OBJS) $(FOBJS)
 
-$(OBJS):
+$(OBJS): %.o: %.c
        $(CC) $(COPT) $(CFLAGS) -c $< -o $@
 
-$(FOBJS):
+$(FOBJS): %.o: fuzix/%.c
        $(CC) $(COPT) $(CFLAGS) -c $< -o $@
 
-
 $(OBJS) : $(INC)
 
 $(FOBJS) : $(INC)

diff --git a/Applications/plato/Makefile.6809 b/Applications/plato/Makefile.6809
index 3a5285e..03e99d6 100644 (file)
--- a/Applications/plato/Makefile.6809
+++ b/Applications/plato/Makefile.6809
@@ -28,7 +28,7 @@ OBJS = $(SRCS:.c=.o)
 FOBJS = $(patsubst fuzix/%.c,%.o, $(FSRCS))
 
 plato: $(OBJS) $(FOBJS)
-       $(LINKER) $(LINKER_OPT) -o sccz80 $(OBJS) $(FOBJS)
+       $(LINKER) $(LINKER_OPT) -o plato $(OBJS) $(FOBJS)
 
 $(OBJS): %.o: %.c
        $(CC) $(COPT) $(CFLAGS) -c $< -o $@
@@ -36,7 +36,6 @@ $(OBJS): %.o: %.c
 $(FOBJS): %.o: fuzix/%.c
        $(CC) $(COPT) $(CFLAGS) -c $< -o $@
 
-
 $(OBJS) : $(INC)
 
 $(FOBJS) : $(INC)

diff --git a/Applications/plato/screen_base.c b/Applications/plato/screen_base.c
index eb05867..c5a7cb2 100644 (file)
--- a/Applications/plato/screen_base.c
+++ b/Applications/plato/screen_base.c
@@ -156,7 +156,7 @@ void screen_char_draw(padPt* Coord, unsigned char* ch, unsigned char count)
   tgi_setcolor(mainColor);
 
   x=scalex[(Coord->x&0x1FF)];
-  y=scaley[(Coord->y)+14&0x1FF];
+  y=scaley[((Coord->y)+14)&0x1FF];
   
   if (FastText==padF)
     {