Merge branch 'dev'

malloc
E. Almqvist 3 years ago
commit 3f1e8cb93b
  1. 2
      Makefile

@ -7,6 +7,7 @@ all: os-image
run: all
qemu-system-x86_64 os-image
drun: clean run
grub: eOS.iso
@ -24,6 +25,7 @@ os-image: bootloader/bootloader.bin kernel.bin
kernel.bin: kernel/kernel_entry.o $(OBJ)
gcc -o $@ $^ -Wl,--oformat=binary -ffreestanding -nostdlib -shared -Ttext 0x1000 -m32
%.o : %.c ${HEADERS}
gcc -fno-pie -m32 -Os -ffreestanding -c $< -o $@

Loading…
Cancel
Save