izaya
/
collapseos
mirror of https://github.com/hsoft/collapseos.git
1
0
Fork 0
Code Issues Releases Wiki Activity

emul: rename stage2 to stage

This commit is contained in:
Virgil Dupras 2020-05-14 10:55:39 -04:00
parent 9d4d9de511
commit 5446afd87d
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emul/.gitignore vendored
View File

@ -1,7 +1,4 @@
/stage1 /stage
/stage1dbg
/stage2
/forth /forth
/*-bin.h /*-bin.h
/stage0.bin
/blkfs /blkfs

8
emul/Makefile
View File

@ -1,4 +1,4 @@
TARGETS = forth stage2 TARGETS = forth stage
OBJS = emul.o libz80/libz80.o OBJS = emul.o libz80/libz80.o
BIN2C = ../tools/bin2c BIN2C = ../tools/bin2c
BLKPACK = ../tools/blkpack BLKPACK = ../tools/blkpack
@ -18,7 +18,7 @@ $(BLKUNPACK): $(BLKPACK)
forth-bin.h: $(BIN2C) forth-bin.h: $(BIN2C)
$(BIN2C) KERNEL < forth.bin > $@ $(BIN2C) KERNEL < forth.bin > $@
stage2: stage.c $(OBJS) forth-bin.h blkfs-bin.h stage: stage.c $(OBJS) forth-bin.h blkfs-bin.h
$(CC) stage.c $(OBJS) -o $@ $(CC) stage.c $(OBJS) -o $@
blkfs: $(BLKPACK) blkfs: $(BLKPACK)
@ -39,8 +39,8 @@ emul.o: emul.c
.PHONY: updatebootstrap .PHONY: updatebootstrap
updatebootstrap: stage2 xcomp.fs updatebootstrap: stage xcomp.fs
./stage2 < xcomp.fs > forth.bin ./stage < xcomp.fs > forth.bin
.PHONY: pack .PHONY: pack
pack: pack:

6
recipes/rc2014/Makefile
View File

@ -2,13 +2,13 @@ TARGET = stage1.bin
BASEDIR = ../.. BASEDIR = ../..
FDIR = $(BASEDIR)/forth FDIR = $(BASEDIR)/forth
EDIR = $(BASEDIR)/emul EDIR = $(BASEDIR)/emul
STAGE2 = $(EDIR)/stage2 STAGE = $(EDIR)/stage
EMUL = $(BASEDIR)/emul/hw/rc2014/classic EMUL = $(BASEDIR)/emul/hw/rc2014/classic
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
$(TARGET): xcomp.fs $(STAGE2) $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE2) > $@ cat xcomp.fs | $(STAGE) > $@
$(SLATEST): $(SLATEST):
$(MAKE) -C $(BASEDIR)/tools $(MAKE) -C $(BASEDIR)/tools

6
recipes/ti84/Makefile
View File

@ -2,14 +2,14 @@ TARGET = stage1.bin
BASEDIR = ../.. BASEDIR = ../..
FDIR = $(BASEDIR)/forth FDIR = $(BASEDIR)/forth
EDIR = $(BASEDIR)/emul EDIR = $(BASEDIR)/emul
STAGE2 = $(EDIR)/stage2 STAGE = $(EDIR)/stage
EMUL = $(BASEDIR)/emul/hw/ti/ti84 EMUL = $(BASEDIR)/emul/hw/ti/ti84
MKTIUPGRADE = mktiupgrade MKTIUPGRADE = mktiupgrade
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
$(TARGET): xcomp.fs $(STAGE2) $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE2) > $@ cat xcomp.fs | $(STAGE) > $@
$(EMUL): $(EMUL):
$(MAKE) -C ${@:%/ti84=%} $(MAKE) -C ${@:%/ti84=%}

6
recipes/trs80/Makefile
View File

@ -1,8 +1,8 @@
TARGET = stage1.bin TARGET = stage1.bin
EDIR = ../../emul EDIR = ../../emul
STAGE2 = $(EDIR)/stage2 STAGE = $(EDIR)/stage
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
$(TARGET): xcomp.fs $(STAGE2) $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE2) > $@ cat xcomp.fs | $(STAGE) > $@