Fixed Makefile

pull/25/head
E. Almqvist 3 years ago
parent 9674151cb4
commit 1b8020b624
  1. 6
      Makefile
  2. 2
      kernel/kernel.c

@ -12,16 +12,16 @@ drun: clean run
grub: eOS.iso grub: eOS.iso
qemu-system-x86_64 eOS.iso qemu-system-x86_64 eOS.iso
eOS.iso : kernel.bin grub/grub.cfg eOS.iso : kernel/kernel.bin grub/grub.cfg
mkdir -p boot/grub mkdir -p boot/grub
cp $< boot/eOS.bin cp $< boot/eOS.bin
cp grub/grub.cfg boot/grub/grub.cfg cp grub/grub.cfg boot/grub/grub.cfg
grub-mkrescue -o eOS.iso ./ grub-mkrescue -o eOS.iso ./
os-image: bootloader.bin kernel.bin os-image: bootloader/bootloader.bin kernel.bin
cat $^ > os-image cat $^ > os-image
kernel.bin: 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 %.o : %.c

@ -1,5 +1,3 @@
#include "../drivers/vga.c"
void main() { void main() {
vga_init(); // Initialize the screen first vga_init(); // Initialize the screen first
// i.e. clear the screen et cetera. // i.e. clear the screen et cetera.

Loading…
Cancel
Save