From 02df33d1aae945e10c9ba2d09bff8502aa5f9b4c Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Mon, 8 Nov 2021 23:54:41 -0300
Subject: [PATCH] Change some dynamically loaded library names to reflect the
 new build infrastructure

---
 src/printer/prt_escp.c      |  2 +-
 src/printer/prt_ps.c        | 12 ++++++++----
 src/sound/midi_fluidsynth.c |  6 +++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c
index 8e490e9e1..1cd3b8ebe 100644
--- a/src/printer/prt_escp.c
+++ b/src/printer/prt_escp.c
@@ -87,7 +87,7 @@
 
 
 #ifdef _WIN32
-# define PATH_FREETYPE_DLL	"freetype.dll"
+# define PATH_FREETYPE_DLL	"libfreetype-6.dll"
 #else
 # define PATH_FREETYPE_DLL	"libfreetype.so.6"
 #endif
diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c
index 5f16784cb..73bd56b63 100644
--- a/src/printer/prt_ps.c
+++ b/src/printer/prt_ps.c
@@ -44,11 +44,15 @@
 #define gs_error_Quit		-101 
 
 #ifdef _WIN32
-#define PATH_GHOSTSCRIPT_DLL		"gsdll32.dll"
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+# define PATH_GHOSTSCRIPT_DLL		"gsdll32.dll"
+#else
+# define PATH_GHOSTSCRIPT_DLL		"gsdll64.dll"
+#endif
 #elif defined __APPLE__
 #define PATH_GHOSTSCRIPT_DLL		"libgs.dylib"
 #else
-#define PATH_GHOSTSCRIPT_DLL		"libgs.so"
+#define PATH_GHOSTSCRIPT_DLL		"libgs.so.9"
 #endif
 
 #define POSTSCRIPT_BUFFER_LENGTH	65536
@@ -344,8 +348,6 @@ ps_init(void *lpt)
     dev->ctrl = 0x04;
     dev->lpt = lpt;
 
-    reset_ps(dev);
-
     /* Try loading the DLL. */
     ghostscript_handle = dynld_module(PATH_GHOSTSCRIPT_DLL, ghostscript_imports);
     if (ghostscript_handle == NULL)
@@ -369,6 +371,8 @@ ps_init(void *lpt)
     timer_add(&dev->pulse_timer, pulse_timer, dev, 0);
     timer_add(&dev->timeout_timer, timeout_timer, dev, 0);
 
+    reset_ps(dev);
+
     return(dev);
 }
 
diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c
index 874d328f3..283188fef 100644
--- a/src/sound/midi_fluidsynth.c
+++ b/src/sound/midi_fluidsynth.c
@@ -224,11 +224,15 @@ void* fluidsynth_init(const device_t *info)
 
 	/* Try loading the DLL. */
 #ifdef _WIN32
+# if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 	fluidsynth_handle = dynld_module("libfluidsynth.dll", fluidsynth_imports);
+# else
+	fluidsynth_handle = dynld_module("libfluidsynth64.dll", fluidsynth_imports);
+# endif
 #elif defined __APPLE__
         fluidsynth_handle = dynld_module("libfluidsynth.dylib", fluidsynth_imports);
 #else
-	fluidsynth_handle = dynld_module("libfluidsynth.so", fluidsynth_imports);
+	fluidsynth_handle = dynld_module("libfluidsynth.so.3", fluidsynth_imports);
 #endif
 	if (fluidsynth_handle == NULL)
 	{