diff options
author | David <dbphillipsnz@gmail.com> | 2014-03-27 20:03:33 +1300 |
---|---|---|
committer | David <dbphillipsnz@gmail.com> | 2014-03-27 20:32:48 +1300 |
commit | 009a998876458f1cbab925c56c95b90d48d72157 (patch) | |
tree | 5db5de0a8ce75e9285b4d647cfd685bec5aefd1c /Makefile | |
parent | 5d944dfe9f03c9fb43271199d2ba4b8880747614 (diff) | |
download | toast-009a998876458f1cbab925c56c95b90d48d72157.tar.xz |
Added a bunch of things. This is the epitome of a bad commit message
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -6,7 +6,9 @@ CFLAGS = -I. -std=gnu99 -ffreestanding -O2 -Wall -Wextra ASFLAGS = -felf LDFLAGS = -Tlink.ld -TOAST_TARGET = ~/programming/toast/toast_img/ +KERNEL = toastk + +TOAST_TARGET = ~/programming/toast/toast-hdd-img/ SOURCES = boot/boot.o \ screen/console.o \ string/common.o \ @@ -17,18 +19,20 @@ SOURCES = boot/boot.o \ all: $(SOURCES) link clean: - - rm *.o */*.o kernel + - rm *.o */*.o $(KERNEL) link: - - $(LD) $(LDFLAGS) -o kernel $(SOURCES) + - $(LD) $(LDFLAGS) -o $(KERNEL) $(SOURCES) .s.o: - nasm $(ASFLAGS) $< install: -# sudo umount $(TOAST_TARGET) - sudo mount /dev/loop1p1 $(TOAST_TARGET) - sudo cp kernel $(TOAST_TARGET) + # need a better way to automate this first bit + sudo mount /dev/loop0p1 $(TOAST_TARGET) + + sudo cp $(KERNEL) $(TOAST_TARGET) ls $(TOAST_TARGET) sudo umount $(TOAST_TARGET) - bochs -qf bochsrc + #bochs -qf bochsrc + qemu-system-i386 -m 64 -hdd ../toast-hdd.img |