diff --git a/emul/Makefile b/emul/Makefile index c196626..947f37d 100644 --- a/emul/Makefile +++ b/emul/Makefile @@ -1,4 +1,4 @@ -TARGETS = forth stage blkfs +TARGETS = forth stage OBJS = emul.o libz80/libz80.o BLKPACK = ../tools/blkpack BLKUNPACK = ../tools/blkunpack @@ -12,13 +12,13 @@ $(BLKPACK): .PHONY: $(BLKUNPACK) $(BLKUNPACK): $(BLKPACK) -stage: stage.c $(OBJS) +stage: stage.c $(OBJS) blkfs $(CC) stage.c $(OBJS) -o $@ blkfs: $(BLKPACK) $(BLKPACK) ../blk > $@ -forth: forth.c $(OBJS) +forth: forth.c $(OBJS) blkfs $(CC) forth.c $(OBJS) -lncurses -o $@ libz80/libz80.o: libz80/z80.c diff --git a/recipes/rc2014/Makefile b/recipes/rc2014/Makefile index 94a0b9d..3e7ccda 100644 --- a/recipes/rc2014/Makefile +++ b/recipes/rc2014/Makefile @@ -10,8 +10,8 @@ all: $(TARGET) $(TARGET): xcomp.fs $(STAGE) cat xcomp.fs | $(STAGE) > $@ -$(SLATEST): - $(MAKE) -C $(BASEDIR)/tools +$(STAGE): + $(MAKE) -C $(EDIR) stage $(EMUL): $(MAKE) -C ${@:%/classic=%} diff --git a/recipes/sms/Makefile b/recipes/sms/Makefile index 4fc7a0c..2adb2e5 100644 --- a/recipes/sms/Makefile +++ b/recipes/sms/Makefile @@ -1,13 +1,17 @@ TARGET = os.bin -STAGE = ../../emul/stage -EMUL = ../../emul/hw/sms/sms +EDIR = ../../emul +STAGE = $(EDIR)/stage +EMUL = $(EDIR)/hw/sms/sms .PHONY: all all: $(TARGET) $(TARGET): xcomp.fs $(STAGE) cat xcomp.fs | $(STAGE) > $@ -os.sms: $(TARGET) +$(STAGE): + $(MAKE) -C $(EDIR) stage + +os.sms: $(TARGET) $(STAGE) dd if=$(TARGET) bs=32752 conv=sync | cat - sega.bin > $@ $(EMUL): diff --git a/recipes/sms/README.md b/recipes/sms/README.md index bcd624c..8a8a525 100644 --- a/recipes/sms/README.md +++ b/recipes/sms/README.md @@ -57,6 +57,11 @@ Of course, that's not a fun way to enter text, but using the D-Pad is the easiest way to get started which doesn't require soldering. Your next step after that would be to [build a PS/2 keyboard adapter!](kbd/README.md) +## Slow initialization in emulation + +When running under the emulator, video initialization is slow, it takes several +seconds. It's the emulator's fault. On real hardware, it's not as slow. + [smspower]: http://www.smspower.org [everdrive]: https://krikzz.com [zasm]: ../../tools/emul diff --git a/recipes/ti84/Makefile b/recipes/ti84/Makefile index bce38c9..30c0bc5 100644 --- a/recipes/ti84/Makefile +++ b/recipes/ti84/Makefile @@ -3,7 +3,7 @@ BASEDIR = ../.. FDIR = $(BASEDIR)/forth EDIR = $(BASEDIR)/emul STAGE = $(EDIR)/stage -EMUL = $(BASEDIR)/emul/hw/ti/ti84 +EMUL = $(EDIR)/hw/ti/ti84 MKTIUPGRADE = mktiupgrade .PHONY: all @@ -11,6 +11,9 @@ all: $(TARGET) $(TARGET): xcomp.fs $(STAGE) cat xcomp.fs | $(STAGE) > $@ +$(STAGE): + $(MAKE) -C $(EDIR) stage + $(EMUL): $(MAKE) -C ${@:%/ti84=%} diff --git a/recipes/trs80/Makefile b/recipes/trs80/Makefile index 9292429..0ddcd85 100644 --- a/recipes/trs80/Makefile +++ b/recipes/trs80/Makefile @@ -6,3 +6,6 @@ STAGE = $(EDIR)/stage all: $(TARGET) $(TARGET): xcomp.fs $(STAGE) cat xcomp.fs | $(STAGE) > $@ + +$(STAGE): + $(MAKE) -C $(EDIR) stage