mirror of
https://github.com/hsoft/collapseos.git
synced 2024-12-25 05:08:05 +11:00
recipes: use cvm's staging binary instead of emul's
Much faster!
This commit is contained in:
parent
8a7fa77163
commit
b3e865d0fb
@ -1,7 +1,7 @@
|
||||
TARGET = disk.bin
|
||||
BASEDIR = ../..
|
||||
EDIR = $(BASEDIR)/emul
|
||||
STAGE = $(EDIR)/stage
|
||||
CDIR = $(BASEDIR)/cvm
|
||||
STAGE = $(CDIR)/stage
|
||||
|
||||
.PHONY: all
|
||||
all: $(TARGET)
|
||||
@ -13,10 +13,10 @@ os.bin: xcomp.fs $(STAGE)
|
||||
|
||||
disk.bin: 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):
|
||||
$(MAKE) -C $(EDIR) stage
|
||||
$(MAKE) -C $(CDIR) stage
|
||||
|
||||
.PHONY: emul
|
||||
emul: $(TARGET)
|
||||
|
@ -1,9 +1,8 @@
|
||||
TARGET = os.bin
|
||||
BASEDIR = ../..
|
||||
FDIR = $(BASEDIR)/forth
|
||||
EDIR = $(BASEDIR)/emul
|
||||
STAGE = $(EDIR)/stage
|
||||
EMUL = $(BASEDIR)/emul/hw/rc2014/classic
|
||||
STAGE = $(BASEDIR)/cvm/stage
|
||||
EMUL = $(EDIR)/hw/rc2014/classic
|
||||
|
||||
.PHONY: all
|
||||
all: $(TARGET)
|
||||
|
@ -1,7 +1,7 @@
|
||||
TARGET = os.bin
|
||||
EDIR = ../../emul
|
||||
STAGE = $(EDIR)/stage
|
||||
EMUL = $(EDIR)/hw/sms/sms
|
||||
BASE = ../../
|
||||
STAGE = $(BASE)/cvm/stage
|
||||
EMUL = $(BASE)/emul/hw/sms/sms
|
||||
|
||||
.PHONY: all
|
||||
all: $(TARGET)
|
||||
@ -9,7 +9,7 @@ $(TARGET): xcomp.fs $(STAGE)
|
||||
cat xcomp.fs | $(STAGE) > $@
|
||||
|
||||
$(STAGE):
|
||||
$(MAKE) -C $(EDIR) stage
|
||||
$(MAKE) -C $(BASE)/cvm stage
|
||||
|
||||
os.sms: $(TARGET) $(STAGE)
|
||||
dd if=$(TARGET) bs=32752 conv=sync | cat - sega.bin > $@
|
||||
|
@ -1,9 +1,8 @@
|
||||
TARGET = os.bin
|
||||
BASEDIR = ../..
|
||||
FDIR = $(BASEDIR)/forth
|
||||
EDIR = $(BASEDIR)/emul
|
||||
STAGE = $(EDIR)/stage
|
||||
EMUL = $(EDIR)/hw/ti/ti84
|
||||
CDIR = $(BASEDIR)/cvm
|
||||
STAGE = $(CDIR)/stage
|
||||
EMUL = $(BASEDIR)/emul/hw/ti/ti84
|
||||
MKTIUPGRADE = mktiupgrade
|
||||
|
||||
.PHONY: all
|
||||
@ -12,7 +11,7 @@ $(TARGET): xcomp.fs $(STAGE)
|
||||
cat xcomp.fs | $(STAGE) > $@
|
||||
|
||||
$(STAGE):
|
||||
$(MAKE) -C $(EDIR) stage
|
||||
$(MAKE) -C $(CDIR) stage
|
||||
|
||||
$(EMUL):
|
||||
$(MAKE) -C ${@:%/ti84=%}
|
||||
|
@ -1,6 +1,6 @@
|
||||
TARGET = os.bin
|
||||
EDIR = ../../emul
|
||||
STAGE = $(EDIR)/stage
|
||||
CDIR = ../../cvm
|
||||
STAGE = $(CDIR)/stage
|
||||
|
||||
.PHONY: all
|
||||
all: $(TARGET)
|
||||
@ -8,4 +8,4 @@ $(TARGET): xcomp.fs $(STAGE)
|
||||
cat xcomp.fs | $(STAGE) > $@
|
||||
|
||||
$(STAGE):
|
||||
$(MAKE) -C $(EDIR) stage
|
||||
$(MAKE) -C $(CDIR) stage
|
||||
|
@ -1,7 +1,7 @@
|
||||
TARGET = os.bin
|
||||
BASEDIR = ../..
|
||||
EDIR = $(BASEDIR)/emul
|
||||
STAGE = $(EDIR)/stage
|
||||
CDIR = $(BASEDIR)/cvm
|
||||
STAGE = $(CDIR)/stage
|
||||
|
||||
.PHONY: all
|
||||
all: $(TARGET)
|
||||
@ -9,5 +9,5 @@ $(TARGET): xcomp.fs $(STAGE)
|
||||
cat xcomp.fs | $(STAGE) > $@
|
||||
|
||||
$(STAGE):
|
||||
$(MAKE) -C $(EDIR) stage
|
||||
$(MAKE) -C $(CDIR) stage
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user