X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B?a=blobdiff_plain;f=Makefile;h=502430a15416276d15b523929b7ec878ba26867b;hb=refs%2Fheads%2Fmm;hp=993a455b631b63c0d082d7150a80de0394bff5b3;hpb=bdad753bd8125abc67a24b5d8030fa9cfb8706db;p=nameless-os.git diff --git a/Makefile b/Makefile index 993a455..502430a 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,20 @@ +export CROSS_COMPILE = i686-elf- export AS = yasm -export CC = i686-elf-gcc -export QEMU = qemu-system-i386 -monitor stdio +export CC = gcc +export QEMU = qemu-system-i386 -monitor stdio -cpu pentium2 export GIT_REV = $(shell git describe --long HEAD) +export REAL_CC = $(CROSS_COMPILE)$(CC) +export CFLAGS +export LDFLAGS +export ASFLAGS MAKEFLAGS += -rR default: kernel/kernel.elf bootloader all: default boot/x86/disk.img run: all - $(QEMU) boot/x86/disk.img + $(QEMU) -drive file=boot/x86/disk.img,format=raw,throttling.iops-total=100 debug: all - $(QEMU) -s -S boot/x86/disk.img + $(QEMU) -s -S -drive file=boot/x86/disk.img,format=raw,throttling.iops-total=100 kernel/kernel.elf: $(MAKE) -C kernel