Okay wow i forgot to commit a bunch of stuff
I added some work on a keyboard driver here also changed the emulation system, since bochs was giving me headaches when it came to keyboard input added some todo stuff.. probably some cleanup, idk
This commit is contained in:
7
Makefile
7
Makefile
@ -2,7 +2,7 @@
|
||||
# or maybe add it to a bash script instead? im not sure
|
||||
|
||||
CC = i686-elf-gcc
|
||||
CFLAGS = -m32 -ffreestanding -Wall -Wextra -Werror -Wpedantic --sysroot=$(PWD)/sysroot -isystem=/usr/include -Iinclude -MD -D__TESTING__
|
||||
CFLAGS = -m32 -ffreestanding -Wall -Wextra -Werror -Wpedantic --sysroot=$(PWD)/sysroot -isystem=/usr/include -Iinclude -MD -D__TESTING__
|
||||
|
||||
AS = nasm
|
||||
ASFLAGS = -f elf
|
||||
@ -44,8 +44,9 @@ os.iso: kernel.elf
|
||||
grub-mkrescue -o $@ iso
|
||||
|
||||
run: os.iso
|
||||
bochs -f util/bochsrc.txt -q
|
||||
|
||||
kitty --hold sh -c "gdb kernel.elf -x util/gdbcmds" &
|
||||
qemu-system-i386 -s -cdrom os.iso
|
||||
|
||||
#TODO: when i inevitably do add libc, this is going to fail because they have the same name as the libk objects
|
||||
#TODO: so we'll need to do a batch rename on one of the two object files,
|
||||
libc.a: CFLAGS:=$(CFLAGS) -D__is_libc # Target rule to define __is_libc
|
||||
|
Reference in New Issue
Block a user