1
0
mirror of https://github.com/hsoft/collapseos.git synced 2024-12-24 14:38:05 +11:00

recipe: fix makefiles for fresh clone contexts

All recipe makesfiles would previously assume a built emul/.

Fixes #113
This commit is contained in:
Virgil Dupras 2020-06-11 12:23:59 -04:00
parent bd7da4658b
commit 394f962510
6 changed files with 24 additions and 9 deletions

View File

@ -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

View File

@ -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=%}

View File

@ -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):

View File

@ -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

View File

@ -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=%}

View File

@ -6,3 +6,6 @@ STAGE = $(EDIR)/stage
all: $(TARGET)
$(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE) > $@
$(STAGE):
$(MAKE) -C $(EDIR) stage