elal
/
eOS
mirror of https://github.com/E-Almqvist/eOS
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
malloc
E. Almqvist 3 years ago
parent 2329765779 3c5cb3bbc6
commit 3f1e8cb93b
1 changed files with 2 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile

2
Makefile
Unescape View File

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

Write Preview
Loading…
Cancel
Save