From 48a656ae2c2ff1394ea08311eb5dce885a68002d Mon Sep 17 00:00:00 2001
From: jaby <jaby@william.zone>
Date: Thu, 23 Nov 2023 22:07:08 -0500
Subject: [PATCH] Integrate library into project

---
 .../include/FontWriter/{FontWriter.hpp => font_writer.hpp} | 0
 examples/PoolBox/PoolBox.code-workspace                    | 3 ++-
 examples/PoolBox/application/Makefile                      | 4 +++-
 examples/PoolBox/application/src/main.cpp                  | 2 ++
 mkfile/PSEXETarget.mk                                      | 7 ++++---
 5 files changed, 11 insertions(+), 5 deletions(-)
 rename Support/include/FontWriter/{FontWriter.hpp => font_writer.hpp} (100%)

diff --git a/Support/include/FontWriter/FontWriter.hpp b/Support/include/FontWriter/font_writer.hpp
similarity index 100%
rename from Support/include/FontWriter/FontWriter.hpp
rename to Support/include/FontWriter/font_writer.hpp
diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace
index b7db6d9b..849b20e6 100644
--- a/examples/PoolBox/PoolBox.code-workspace
+++ b/examples/PoolBox/PoolBox.code-workspace
@@ -72,7 +72,8 @@
 	},
 	"settings": {
 		"C_Cpp.default.includePath": [
-			"${env:JABY_ENGINE_PATH}/include"
+			"${env:JABY_ENGINE_PATH}/include",
+			"${env:JABY_ENGINE_PATH}/Support/include"
             ],
 		"C_Cpp.default.compilerPath": "",
 		"C_Cpp.default.cStandard": "c17",
diff --git a/examples/PoolBox/application/Makefile b/examples/PoolBox/application/Makefile
index 77365839..7c394ef5 100644
--- a/examples/PoolBox/application/Makefile
+++ b/examples/PoolBox/application/Makefile
@@ -5,8 +5,10 @@ OVERLAY_CONFIG = Overlays.json
 include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk
 SRCS  = $(call rwildcard, src, c cpp)
 
-INCLUDES += -I$(JABY_ENGINE_DIR)/include
+INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include -I$(JABY_ENGINE_DIR)/include
 CCFLAGS  += -save-temps=obj
 
+LIBS += -lFontWriter
+
 include $(JABY_ENGINE_DIR)/mkfile/Makefile
 include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk
\ No newline at end of file
diff --git a/examples/PoolBox/application/src/main.cpp b/examples/PoolBox/application/src/main.cpp
index cd0cc4c4..25f7a43b 100644
--- a/examples/PoolBox/application/src/main.cpp
+++ b/examples/PoolBox/application/src/main.cpp
@@ -5,6 +5,7 @@
 #include <PSX/GPU/gpu.hpp>
 #include <PSX/GPU/gpu_primitives.hpp>
 #include <PSX/Timer/frame_timer.hpp>
+#include <FontWriter/FontWriter.hpp>
 #include <stdio.h>
 
 using namespace JabyEngine;
@@ -34,6 +35,7 @@ static void render() {
 }
 
 void main() {
+    test();
     setup();
 
     Overlay::TimerTest::mesaure_busy_loop();
diff --git a/mkfile/PSEXETarget.mk b/mkfile/PSEXETarget.mk
index c92b7ba4..1186df44 100644
--- a/mkfile/PSEXETarget.mk
+++ b/mkfile/PSEXETarget.mk
@@ -4,14 +4,15 @@ AUTO_OVERLAY_DIR = $(OUTPUT_DIR)/auto_overlay
 include $(AUTO_OVERLAY_DIR)/Overlays.mk
 
 #We use the JabyEngine so we will include ourselves
-JABY_ENGINE_LIB_DIR  = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)
-JABY_ENGINE_LIB_NAME = JabyEngine_$(TV_FORMAT)
+JABY_ENGINE_LIB_DIR         = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)
+JABY_ENGINE_SUPPORT_LIB_DIR = $(JABY_ENGINE_DIR)/Support/lib/PSX-$(BUILD_PROFILE)
+JABY_ENGINE_LIB_NAME        = JabyEngine_$(TV_FORMAT)
 
 OVERLAY_TARGET = $(foreach ovl, $(OVERLAYSECTION), $(OUTPUT_DIR)/Overlay$(ovl))
 
 #Linking rule
 $(TARGET).elf: $(OBJS) $(JABY_ENGINE_LIB_DIR)/lib$(JABY_ENGINE_LIB_NAME).a $(AUTO_OVERLAY_DIR)/Overlays.ld
-	$(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) -L$(JABY_ENGINE_LIB_DIR) -L$(AUTO_OVERLAY_DIR) -l$(JABY_ENGINE_LIB_NAME) $(LIBS)
+	$(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) -L$(JABY_ENGINE_LIB_DIR) -L$(JABY_ENGINE_SUPPORT_LIB_DIR) -L$(AUTO_OVERLAY_DIR) -l$(JABY_ENGINE_LIB_NAME) $(LIBS)
 
 #Strips the psexe
 $(TARGET).psexe: $(TARGET).elf