izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2025-04-17 01:18:16 +10:00
Code Issues Releases Wiki Activity

recipes: use cvm's staging binary instead of emul's

Browse Source 
Much faster!
This commit is contained in:
Virgil Dupras 2020-06-26 21:23:13 -04:00
parent 8a7fa77163
commit b3e865d0fb
6 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes/pcat/Makefile
View File

@ -1,7 +1,7 @@
TARGET = disk.bin TARGET = disk.bin
BASEDIR = ../.. BASEDIR = ../..
EDIR = $(BASEDIR)/emul CDIR = $(BASEDIR)/cvm
STAGE = $(EDIR)/stage STAGE = $(CDIR)/stage
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
@ -13,10 +13,10 @@ os.bin: xcomp.fs $(STAGE)
disk.bin: mbr.bin os.bin disk.bin: mbr.bin os.bin
cat mbr.bin os.bin > $@ cat mbr.bin os.bin > $@
dd if=$(EDIR)/blkfs of=$@ bs=512 seek=16 dd if=$(CDIR)/blkfs of=$@ bs=512 seek=16
$(STAGE): $(STAGE):
$(MAKE) -C $(EDIR) stage $(MAKE) -C $(CDIR) stage
.PHONY: emul .PHONY: emul
emul: $(TARGET) emul: $(TARGET)

5
recipes/rc2014/Makefile
View File

@ -1,9 +1,8 @@
TARGET = os.bin TARGET = os.bin
BASEDIR = ../.. BASEDIR = ../..
FDIR = $(BASEDIR)/forth
EDIR = $(BASEDIR)/emul EDIR = $(BASEDIR)/emul
STAGE = $(EDIR)/stage STAGE = $(BASEDIR)/cvm/stage
EMUL = $(BASEDIR)/emul/hw/rc2014/classic EMUL = $(EDIR)/hw/rc2014/classic
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)

8
recipes/sms/Makefile
View File

@ -1,7 +1,7 @@
TARGET = os.bin TARGET = os.bin
EDIR = ../../emul BASE = ../../
STAGE = $(EDIR)/stage STAGE = $(BASE)/cvm/stage
EMUL = $(EDIR)/hw/sms/sms EMUL = $(BASE)/emul/hw/sms/sms
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
@ -9,7 +9,7 @@ $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE) > $@ cat xcomp.fs | $(STAGE) > $@
$(STAGE): $(STAGE):
$(MAKE) -C $(EDIR) stage $(MAKE) -C $(BASE)/cvm stage
os.sms: $(TARGET) $(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 > $@

9
recipes/ti84/Makefile
View File

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

6
recipes/trs80/Makefile
View File

@ -1,6 +1,6 @@
TARGET = os.bin TARGET = os.bin
EDIR = ../../emul CDIR = ../../cvm
STAGE = $(EDIR)/stage STAGE = $(CDIR)/stage
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
@ -8,4 +8,4 @@ $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE) > $@ cat xcomp.fs | $(STAGE) > $@
$(STAGE): $(STAGE):
$(MAKE) -C $(EDIR) stage $(MAKE) -C $(CDIR) stage

6
recipes/z80mbc2/Makefile
View File

@ -1,7 +1,7 @@
TARGET = os.bin TARGET = os.bin
BASEDIR = ../.. BASEDIR = ../..
EDIR = $(BASEDIR)/emul CDIR = $(BASEDIR)/cvm
STAGE = $(EDIR)/stage STAGE = $(CDIR)/stage
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
@ -9,5 +9,5 @@ $(TARGET): xcomp.fs $(STAGE)
cat xcomp.fs | $(STAGE) > $@ cat xcomp.fs | $(STAGE) > $@
$(STAGE): $(STAGE):
$(MAKE) -C $(EDIR) stage $(MAKE) -C $(CDIR) stage