From a6071fd5fc141513b49ad93852df541b1fc0217d Mon Sep 17 00:00:00 2001
From: jaby <jaby@william.zone>
Date: Mon, 27 Nov 2023 21:11:09 -0500
Subject: [PATCH] Fix build of support library

---
 Support/src/Makefile                              | 2 +-
 Support/src/SupportLibrary.code-workspace         | 3 +++
 examples/PoolBox/application/Makefile             | 2 +-
 mkfile/PSEXETarget.mk                             | 6 ++++--
 template/JabyEngine-PSX_Game/application/Makefile | 3 +++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Support/src/Makefile b/Support/src/Makefile
index 01434bd5..c5efff53 100644
--- a/Support/src/Makefile
+++ b/Support/src/Makefile
@@ -1,5 +1,5 @@
 FontWriter: always
-	$(MAKE) -C FontWriter
+	$(MAKE) -C $(JABY_ENGINE_DIR)/Support/src/FontWriter $(MAKECMDGOALS)
 
 all: FontWriter
 
diff --git a/Support/src/SupportLibrary.code-workspace b/Support/src/SupportLibrary.code-workspace
index f4ea81fd..9fea4a4e 100644
--- a/Support/src/SupportLibrary.code-workspace
+++ b/Support/src/SupportLibrary.code-workspace
@@ -25,6 +25,9 @@
                 "linux":   {
                     "command": "make ${input:target} BUILD_PROFILE=${input:build cfg}",
                 },
+                "options": {
+                    "cwd": "${workspaceFolder}/FontWriter"
+                },
                 "group": "build"
             }
         ],
diff --git a/examples/PoolBox/application/Makefile b/examples/PoolBox/application/Makefile
index 7c394ef5..269b0507 100644
--- a/examples/PoolBox/application/Makefile
+++ b/examples/PoolBox/application/Makefile
@@ -8,7 +8,7 @@ SRCS  = $(call rwildcard, src, c cpp)
 INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include -I$(JABY_ENGINE_DIR)/include
 CCFLAGS  += -save-temps=obj
 
-LIBS += -lFontWriter
+SUPPORT_LIBS += FontWriter
 
 include $(JABY_ENGINE_DIR)/mkfile/Makefile
 include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk
\ No newline at end of file
diff --git a/mkfile/PSEXETarget.mk b/mkfile/PSEXETarget.mk
index 1186df44..02433a68 100644
--- a/mkfile/PSEXETarget.mk
+++ b/mkfile/PSEXETarget.mk
@@ -6,13 +6,15 @@ 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_SUPPORT_LIB_DIR = $(JABY_ENGINE_DIR)/Support/lib/PSX-$(BUILD_PROFILE)
+JABY_ENGINE_SUPPORT_LIBS    = $(addprefix -l,$(SUPPORT_LIBS))
+JABY_ENGINE_SUPPORT_DEPS    = $(addsuffix .a,$(addprefix $(JABY_ENGINE_SUPPORT_LIB_DIR)/lib,$(SUPPORT_LIBS)))
 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$(JABY_ENGINE_SUPPORT_LIB_DIR) -L$(AUTO_OVERLAY_DIR) -l$(JABY_ENGINE_LIB_NAME) $(LIBS)
+$(TARGET).elf: $(OBJS) $(JABY_ENGINE_LIB_DIR)/lib$(JABY_ENGINE_LIB_NAME).a $(JABY_ENGINE_SUPPORT_DEPS) $(AUTO_OVERLAY_DIR)/Overlays.ld
+	$(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) $(JABY_ENGINE_SUPPORT_LIBS)
 
 #Strips the psexe
 $(TARGET).psexe: $(TARGET).elf
diff --git a/template/JabyEngine-PSX_Game/application/Makefile b/template/JabyEngine-PSX_Game/application/Makefile
index f0ac70ea..040b2822 100644
--- a/template/JabyEngine-PSX_Game/application/Makefile
+++ b/template/JabyEngine-PSX_Game/application/Makefile
@@ -7,5 +7,8 @@ SRCS  = $(call rwildcard, src, c cpp)
 
 INCLUDES += -I$(JABY_ENGINE_DIR)/include
 
+#Example for using Support libs
+#SUPPORT_LIBS += FontWriter
+
 include $(JABY_ENGINE_DIR)/lib/Makefile
 include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk
\ No newline at end of file