diff options
| author | Michal Idziorek <m.i@gmx.at> | 2015-05-13 01:18:53 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2015-05-13 01:18:53 +0200 |
| commit | d7c12c5210ed1545549b9d2b14fb9fb89ce652e2 (patch) | |
| tree | 845e62b2f504138e7a95e35eee31d9b3a38bb287 /Makefile | |
| parent | 2c1148e7920cf1d4c772d0d81757a7f8d736648e (diff) | |
implementing multiboot spec stuff
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -10,7 +10,8 @@ # main phony targets -.PHONY: all new run newrun stick clean +.PHONY: all new run newrun stick clean tags + ############ some constants ############ @@ -86,7 +87,7 @@ ASM_MULTIBOOT_OBJ=$(patsubst %.s, %.o, $(ASM_MULTIBOOT)) all: $(FOOLOS) #$(FOOLOS_VDI) new: clean all -run: run-qemu +run: run-qemu-debug newrun: clean run @@ -158,10 +159,11 @@ run-bochs: all # run in qemu run-qemu: all - qemu-system-i386 $(FOOLOS) + qemu -enable-kvm $(FOOLOS) run-qemu-debug: all - qemu-system-i386 -s -S ~/temp/FoolOs/disk.img +# qemu -enable-kvm -s -S ~/temp/FoolOs/disk.img + qemu -enable-kvm -s ~/temp/FoolOs/disk.img ############ create bootable usb image ############ @@ -173,4 +175,8 @@ stick: $(FOOLOS) ############ cleanup ############ clean: $(CLEANDIRS) - -rm *.bin $(FOOLOS) $(FOOLOS_VDI) $(KERNEL_ENTRY) $(ASM_MULTIBOOT_OBJ) $(KERNEL_IMG) $(ASM_OBJECTS) $(OBJECTS) $(IMG_FILLUP) $(BIN_MBR) $(BIN_MP) $(BIN_STAGE2) $(DEPS) bochs.out bochs.log ne2k-tx.log ne2k-txdump.txt + -rm *.bin $(FOOLOS) $(FOOLOS_VDI) $(KERNEL_ENTRY) $(ASM_MULTIBOOT_OBJ) $(KERNEL_IMG) $(ASM_OBJECTS) $(OBJECTS) $(IMG_FILLUP) $(BIN_MBR) $(BIN_MP) $(BIN_STAGE2) $(DEPS) bochs.out bochs.log ne2k-tx.log ne2k-txdump.txt tags + +tags: + ctags --recurse=yes . + |