From abaab98bd757cd0818cfcddc983eee25ab7672ed Mon Sep 17 00:00:00 2001
From: EmulatedSeasons <89668582+EmulatedSeasons@users.noreply.github.com>
Date: Tue, 7 May 2024 11:07:03 -0400
Subject: Made framebuffer class, serial write functions, and finally got
 makefile to build without having to make clean

---
 libc/makefile  | 14 +++++++-------
 libc/putchar.c |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'libc')

diff --git a/libc/makefile b/libc/makefile
index 560efb7..aec21ef 100644
--- a/libc/makefile
+++ b/libc/makefile
@@ -6,21 +6,21 @@ endif
 
 ifndef CFLAGS
 	CFLAGS = -ffreestanding -Wall -Wextra -g -std=gnu11 -O2 -Iinclude
-	CFLAGS += --sysroot="$(SYSROOT)"
-	CFLAGS += -isystem="/usr/include"
+	CFLAGS += --sysroot=$(SYSROOT)
+	CFLAGS += -isystem $(SYSROOT)/usr/include
 endif
 
 ifndef CXXFLAGS
 	CXXFLAGS = -ffreestanding -Wall -Wextra -fno-exceptions -fno-rtti -D__is_kernel -g -O2 -Iinclude
 	CXXFLAGS += -Iinclude
-	CXXFLAGS += --sysroot="$(SYSROOT)"
-	CXXFLAGS += -isystem="/usr/include"
+	CXXFLAGS += --sysroot=$(SYSROOT)
+	CXXFLAGS += -isystem $(SYSROOT)/usr/include
 endif
 
 ifndef LDFLAGS
 	LDFLAGS = -T arch/$(ARCH)/linker.ld -ffreestanding -g -O2 -Iinclude
-	LDFLAGS += --sysroot="$(SYSROOT)"
-	LDFLAGS += -isystem="/usr/include"
+	LDFLAGS += --sysroot=$(SYSROOT)
+	LDFLAGS += -isystem $(SYSROOT)/usr/include
 endif
 
 ifndef SYSROOT
@@ -76,4 +76,4 @@ install-lib: libc.a
 
 clean:
 	$(info [INFO] Cleaning)
-	$(RM) ${OBJECTS} $(DEPFILES)
\ No newline at end of file
+	$(RM) ${OBJECTS} $(DEPFILES) libc.a
\ No newline at end of file
diff --git a/libc/putchar.c b/libc/putchar.c
index 48147bf..f0f5783 100644
--- a/libc/putchar.c
+++ b/libc/putchar.c
@@ -1,9 +1,11 @@
 #include <stdio.h>
  
 //#include <arch/i386/tmtty.h>
+#include <arch/x86_64/serial.h>
  
 int putchar(int ic) {
 	char c = (char) ic;
+	serial_putchar(c);
 	//terminal_write(&c, sizeof(c));
 	return ic;
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2