From 138cf33a18d7c0d87991ebe3d3ac12b395eb4390 Mon Sep 17 00:00:00 2001
From: vgmoose <me@vgmoose.com>
Date: Tue, 5 Dec 2023 17:40:14 -0500
Subject: [PATCH 1/2] ci: pc: fail build if non-zero exit code

---
 helpers/build_pc.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/helpers/build_pc.sh b/helpers/build_pc.sh
index 24d1b3c..b7b9c59 100755
--- a/helpers/build_pc.sh
+++ b/helpers/build_pc.sh
@@ -59,6 +59,12 @@ fi
 # call the right make command, (the makefile should take care of platform-dependent stuff)
 $MAKE_COMMAND
 
+# fail if the build failed
+if [ $? -ne 0 ]; then
+    echo "PC Build failed!"
+    exit 1
+fi
+
 resin_path="resin"
 
 # package the binary into a zip, alongside assets

From cdde6a3ceb4d71e04c66bea37c64b4549ca1654d Mon Sep 17 00:00:00 2001
From: vgmoose <me@vgmoose.com>
Date: Sat, 16 Dec 2023 12:42:11 -0500
Subject: [PATCH 2/2] makefile: allow LIBDIRS to be modified externally, pass
 on PC builds

---
 helpers/Makefile.pc   | 4 ++--
 helpers/Makefile.wiiu | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helpers/Makefile.pc b/helpers/Makefile.pc
index b7f3b09..de785f6 100644
--- a/helpers/Makefile.pc
+++ b/helpers/Makefile.pc
@@ -11,10 +11,10 @@ else
 endif
 
 pc: $(OFILES)
-	$(CXX) $(OFILES) $(LDFLAGS) -o $(BINARY).bin -fstack-protector-all
+	$(CXX) $(OFILES) $(LDFLAGS) $(LIBPATHS) -o $(BINARY).bin -fstack-protector-all
 
 pc-sdl1: $(OFILES)
-	$(CXX) $(OFILES) $(LDFLAGS) -o $(BINARY).bin-sdl1 -fstack-protector-all $(FRAMEWORK_FLAGS)
+	$(CXX) $(OFILES) $(LDFLAGS) $(LIBPATHS) -o $(BINARY).bin-sdl1 -fstack-protector-all $(FRAMEWORK_FLAGS)
 
 %.o: %.cpp %.c
 	$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDE) $< -c -o $@ -fstack-protector-all
diff --git a/helpers/Makefile.wiiu b/helpers/Makefile.wiiu
index 1565712..2402073 100644
--- a/helpers/Makefile.wiiu
+++ b/helpers/Makefile.wiiu
@@ -16,7 +16,7 @@ LDFLAGS		+=	-g $(MACHDEP) $(RPXSPECS) -Wl,-Map,$(notdir $*.map)
 LIBS		+= -lmodplug -lmpg123 -lvorbisidec -logg -lSDL2 -lwut -lcurl -lmbedtls -lmbedcrypto -lmbedx509 -lz -lwut -lharfbuzz -lfreetype
 
 BUILD		:= build_wiiu
-LIBDIRS		:= $(PORTLIBS) $(WUT_ROOT)
+LIBDIRS		+= $(PORTLIBS) $(WUT_ROOT)
 
 SOURCES     += $(CHESTO_DIR)/libs/wiiu_kbd
 VPATH       += $(CHESTO_DIR)/libs/wiiu_kbd