izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-23 23:38:06 +11:00
Code Issues Releases Wiki Activity

recipe: fix makefiles for fresh clone contexts

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emul/Makefile
View File

@ -1,4 +1,4 @@
TARGETS = forth stage blkfs TARGETS = forth stage
OBJS = emul.o libz80/libz80.o OBJS = emul.o libz80/libz80.o
BLKPACK = ../tools/blkpack BLKPACK = ../tools/blkpack
BLKUNPACK = ../tools/blkunpack BLKUNPACK = ../tools/blkunpack
@ -12,13 +12,13 @@ $(BLKPACK):
.PHONY: $(BLKUNPACK) .PHONY: $(BLKUNPACK)
$(BLKUNPACK): $(BLKPACK) $(BLKUNPACK): $(BLKPACK)
stage: stage.c $(OBJS) stage: stage.c $(OBJS) blkfs
$(CC) stage.c $(OBJS) -o $@ $(CC) stage.c $(OBJS) -o $@
blkfs: $(BLKPACK) blkfs: $(BLKPACK)
$(BLKPACK) ../blk > $@ $(BLKPACK) ../blk > $@
forth: forth.c $(OBJS) forth: forth.c $(OBJS) blkfs
$(CC) forth.c $(OBJS) -lncurses -o $@ $(CC) forth.c $(OBJS) -lncurses -o $@
libz80/libz80.o: libz80/z80.c libz80/libz80.o: libz80/z80.c

4
recipes/rc2014/Makefile
View File

@ -10,8 +10,8 @@ all: $(TARGET)
$(TARGET): xcomp.fs $(STAGE) $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE) > $@ cat xcomp.fs | $(STAGE) > $@
$(SLATEST): $(STAGE):
$(MAKE) -C $(BASEDIR)/tools $(MAKE) -C $(EDIR) stage
$(EMUL): $(EMUL):
$(MAKE) -C ${@:%/classic=%} $(MAKE) -C ${@:%/classic=%}

10
recipes/sms/Makefile
View File

@ -1,13 +1,17 @@
TARGET = os.bin TARGET = os.bin
STAGE = ../../emul/stage EDIR = ../../emul
EMUL = ../../emul/hw/sms/sms STAGE = $(EDIR)/stage
EMUL = $(EDIR)/hw/sms/sms
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
$(TARGET): xcomp.fs $(STAGE) $(TARGET): xcomp.fs $(STAGE)
cat 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 > $@ dd if=$(TARGET) bs=32752 conv=sync | cat - sega.bin > $@
$(EMUL): $(EMUL):

5
recipes/sms/README.md
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 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) 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 [smspower]: http://www.smspower.org
[everdrive]: https://krikzz.com [everdrive]: https://krikzz.com
[zasm]: ../../tools/emul [zasm]: ../../tools/emul

5
recipes/ti84/Makefile
View File

@ -3,7 +3,7 @@ BASEDIR = ../..
FDIR = $(BASEDIR)/forth FDIR = $(BASEDIR)/forth
EDIR = $(BASEDIR)/emul EDIR = $(BASEDIR)/emul
STAGE = $(EDIR)/stage STAGE = $(EDIR)/stage
EMUL = $(BASEDIR)/emul/hw/ti/ti84 EMUL = $(EDIR)/hw/ti/ti84
MKTIUPGRADE = mktiupgrade MKTIUPGRADE = mktiupgrade
.PHONY: all .PHONY: all
@ -11,6 +11,9 @@ all: $(TARGET)
$(TARGET): xcomp.fs $(STAGE) $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE) > $@ cat xcomp.fs | $(STAGE) > $@
$(STAGE):
$(MAKE) -C $(EDIR) stage
$(EMUL): $(EMUL):
$(MAKE) -C ${@:%/ti84=%} $(MAKE) -C ${@:%/ti84=%}

3
recipes/trs80/Makefile
View File

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