Compare commits

..

2 commits

Author SHA1 Message Date
hippoz
eae0e5e345
fix makefile clean rule 2022-02-24 18:18:31 +02:00
hippoz
bb30cd2a65
rename vga to terminal and move to gfx folder 2022-02-24 18:16:17 +02:00
5 changed files with 5 additions and 5 deletions

View file

@ -8,7 +8,7 @@ CC=i686-elf-gcc
bootstrap.o: bootstrap.s bootstrap.o: bootstrap.s
i686-elf-as bootstrap.s -o bootstrap.o i686-elf-as bootstrap.s -o bootstrap.o
kernel.bin: bootstrap.o vga.o std/std.o std/kstd.o cpu/idt.o cpu/pic.o cpu/exception.o kernel.o kernel.bin: bootstrap.o gfx/terminal.o std/std.o std/kstd.o cpu/idt.o cpu/pic.o cpu/exception.o kernel.o
$(CC) -T linker.ld -o $@ -ffreestanding -O2 -nostdlib -lgcc $^ $(CC) -T linker.ld -o $@ -ffreestanding -O2 -nostdlib -lgcc $^
iso: kernel.bin iso: kernel.bin
@ -21,5 +21,5 @@ run: iso
qemu-system-i386 -d int -M smm=off -cdrom generated-iso.iso qemu-system-i386 -d int -M smm=off -cdrom generated-iso.iso
clean: clean:
rm -rf *.o kernel.bin *.iso isodir/ rm -rf *.o **/**.o kernel.bin *.iso isodir/

View file

@ -1,4 +1,4 @@
#include "vga.h" #include "gfx/terminal.h"
#include "std/std.h" #include "std/std.h"
size_t terminal_row; size_t terminal_row;

View file

@ -1,7 +1,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "vga.h" #include "gfx/terminal.h"
#include "cpu/pic.h" #include "cpu/pic.h"
#include "cpu/idt.h" #include "cpu/idt.h"
#include "std/kstd.h" #include "std/kstd.h"

View file

@ -2,7 +2,7 @@
#include <limits.h> #include <limits.h>
#include "std/kstd.h" #include "std/kstd.h"
#include "std/std.h" #include "std/std.h"
#include "vga.h" #include "gfx/terminal.h"
int putchar(int ic) { int putchar(int ic) {
char c = (char) ic; char c = (char) ic;