X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=Makefile;h=96227190c668bcefc8be592e269e97787a815bdf;hp=23c8eafe33e16eb5ea3ee3f16c9bf0d1dd7aa10d;hb=3cb6f9dad7e37db865bd3cbccf0b5d6471fdd73f;hpb=395502ec9dab0fda04bacb223f1fecdbbbdbe1b7 diff --git a/Makefile b/Makefile index 23c8eaf..9622719 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ csrc = $(wildcard src/*.c) $(wildcard src/libc/*.c) $(wildcard src/test/*.c) -ssrc = $(wildcard src/*.s) $(wildcard src/libc/*.s) $(wildcard src/boot/*.s) +ssrc = $(wildcard src/*.s) $(wildcard src/libc/*.s) $(wildcard src/boot/*.s) $(wildcard src/test/*.s) Ssrc = $(wildcard src/*.S) obj = $(csrc:.c=.o) $(ssrc:.s=.o) $(Ssrc:.S=.o) dep = $(obj:.o=.d) @@ -16,6 +16,7 @@ CFLAGS = $(ccarch) -march=i386 $(warn) $(opt) $(dbg) $(gccopt) $(inc) $(def) ASFLAGS = $(asarch) -march=i386 $(dbg) -nostdinc -fno-builtin $(inc) LDFLAGS = $(ldarch) -nostdlib -T pcboot.ld -print-gc-sections +QEMU_FLAGS = -fda floppy.img -serial file:serial.log -soundhw sb16 ifneq ($(shell uname -m), i386) ccarch = -m32 @@ -71,11 +72,11 @@ $(elf).sym: $(elf) .PHONY: run run: $(bin) - qemu-system-i386 -fda floppy.img -serial file:serial.log + qemu-system-i386 $(QEMU_FLAGS) .PHONY: debug debug: $(bin) $(elf).sym - qemu-system-i386 -fda floppy.img -serial file:serial.log -s -S + qemu-system-i386 $(QEMU_FLAGS) -s -S .PHONY: sym sym: $(elf).sym