From 85faff5e7dd485270174f8be44f42f5d9af74488 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Mon, 18 Jul 2022 03:06:13 +0200
Subject: [PATCH 1/2] Fix ZAPDTR linking order for linux builds

---
 ZAPDTR/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZAPDTR/Makefile b/ZAPDTR/Makefile
index 755fd931aa6..d4137a4c29c 100644
--- a/ZAPDTR/Makefile
+++ b/ZAPDTR/Makefile
@@ -46,7 +46,7 @@ endif
 # CXXFLAGS += -DTEXTURE_DEBUG
 
 LDFLAGS := -lm -ldl \
-  -L../StormLib/build -L../libultraship -lbz2 -pthread -lultraship -lstorm
+  -L../StormLib/build -L../libultraship -pthread -lultraship ZAPDUtils/ZAPDUtils.a ../StormLib/build/libstorm.a -lbz2
 
 ifeq ($(UNAME), Darwin)
   LDFLAGS += $(shell pkg-config --libs glew libpng zlib) $(shell sdl2-config --libs) -framework OpenGL -framework Foundation
@@ -137,4 +137,4 @@ ZAPDUtils:
 
 # Linking
 ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils StormLib
-	$(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a ../StormLib/build/libstorm.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)
+	$(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)

From 550ed7c47c2173b78497a4749218f72910e0c853 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Mon, 18 Jul 2022 19:40:36 +0200
Subject: [PATCH 2/2] Fix linking on macos

---
 ZAPDTR/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZAPDTR/Makefile b/ZAPDTR/Makefile
index d4137a4c29c..6d8ba354d47 100644
--- a/ZAPDTR/Makefile
+++ b/ZAPDTR/Makefile
@@ -45,8 +45,8 @@ ifneq ($(DEPRECATION_ON),0)
 endif
 # CXXFLAGS += -DTEXTURE_DEBUG
 
-LDFLAGS := -lm -ldl \
-  -L../StormLib/build -L../libultraship -pthread -lultraship ZAPDUtils/ZAPDUtils.a ../StormLib/build/libstorm.a -lbz2
+LDFLAGS := -Llib/libgfxd -L../libultraship -L../StormLib/build \
+  -pthread -lgfxd -lultraship ZAPDUtils/ZAPDUtils.a -lstorm -lbz2 -lm -ldl
 
 ifeq ($(UNAME), Darwin)
   LDFLAGS += $(shell pkg-config --libs glew libpng zlib) $(shell sdl2-config --libs) -framework OpenGL -framework Foundation
@@ -137,4 +137,4 @@ ZAPDUtils:
 
 # Linking
 ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils StormLib
-	$(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)
+	$(CXX) $(CXXFLAGS) $(O_FILES) $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)