diff --git a/Makefile b/Makefile index ef266d7..6d1fa3e 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,16 @@ USER_PROGRAM_NAMES := $(USER_PROGRAMS:%=user/%) USER_PROGRAM_FILES := $(USER_PROGRAMS:%=initrd/%) -run: $(USER_PROGRAM_NAMES) $(IMAGE_FILE) +run: build initrd user/hlib $(USER_PROGRAM_NAMES) $(IMAGE_FILE) @echo "starting qemu" @$(EMU) $(EMUFLAGS) +build: + @mkdir build + +initrd: + @mkdir initrd + $(IMAGE_FILE): rootfs/boot/kernel rootfs/initrd.tar @echo "creating the iso image" @dd if=/dev/zero of=$(IMAGE_FILE) bs=512 count=32768 &&\ diff --git a/Makefile b/Makefile index ef266d7..6d1fa3e 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,16 @@ USER_PROGRAM_NAMES := $(USER_PROGRAMS:%=user/%) USER_PROGRAM_FILES := $(USER_PROGRAMS:%=initrd/%) -run: $(USER_PROGRAM_NAMES) $(IMAGE_FILE) +run: build initrd user/hlib $(USER_PROGRAM_NAMES) $(IMAGE_FILE) @echo "starting qemu" @$(EMU) $(EMUFLAGS) +build: + @mkdir build + +initrd: + @mkdir initrd + $(IMAGE_FILE): rootfs/boot/kernel rootfs/initrd.tar @echo "creating the iso image" @dd if=/dev/zero of=$(IMAGE_FILE) bs=512 count=32768 &&\ diff --git a/src/userland/crashTest/Makefile b/src/userland/crashTest/Makefile index 700f612..4b688db 100644 --- a/src/userland/crashTest/Makefile +++ b/src/userland/crashTest/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I ../../include -I include -Wno-discarded-qualifiers -fms-extensions -Wno-shift-count-overflow -O0 +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I ../../include -I include -Wno-discarded-qualifiers -fms-extensions -Wno-shift-count-overflow -O0 -Wnodiv-by-zero LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T ../link.ld AS = nasm