juju/JuliOS
1
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

Compare commits

base: juju:fc5afb7e2f9773147d524a65e62db94bd51ac5f2
Branches Tags
juju:master
juju:yield_executor
..
compare: juju:bb7334e3436e91f3f1720f42902770fa2411ed7c
Branches Tags
juju:master
juju:yield_executor

No commits in common. "fc5afb7e2f9773147d524a65e62db94bd51ac5f2" and "bb7334e3436e91f3f1720f42902770fa2411ed7c" have entirely different histories.
fc5afb7e2f ... bb7334e343

1 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

12
Makefile
View File

@ -9,14 +9,10 @@ LIB_JULIOS = target/x86_64-julios/debug/libjulios.a
GRUB_CFG = grub/grub.cfg GRUB_CFG = grub/grub.cfg
SRC = src/lib.rs
all: $(ISO) all: $(ISO)
run: $(ISO)
qemu-system-x86_64 -cdrom $<
debug: $(ISO)
bochs -q
$(ISO): install $(ISO): install
grub-mkrescue -o $@ $(INSTALL_ROOT) grub-mkrescue -o $@ $(INSTALL_ROOT)
@ -29,7 +25,7 @@ install: $(KERNEL) $(GRUB_CFG)
$(KERNEL): $(LIB_JULIOS) $(LINKER_SCRIPT) $(BOOT_OBJS) $(KERNEL): $(LIB_JULIOS) $(LINKER_SCRIPT) $(BOOT_OBJS)
ld -n -T $(LINKER_SCRIPT) -o $(KERNEL) $(BOOT_OBJS) $(LIB_JULIOS) ld -n -T $(LINKER_SCRIPT) -o $(KERNEL) $(BOOT_OBJS) $(LIB_JULIOS)
$(LIB_JULIOS): $(LIB_JULIOS): $(SRC)
cargo build cargo build
@ -42,4 +38,4 @@ clean:
$(RM) julios.iso $(RM) julios.iso
$(RM) -r iso $(RM) -r iso
.PHONY: $(INSTALL_ROOT) install clean all run debug $(LIB_JULIOS) .PHONY: $(INSTALL_ROOT) install clean all