claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change some dynamically loaded library names to reflect the new build infrastructure

Browse Source
This commit is contained in:
RichardG867
2021-11-08 23:54:41 -03:00
parent e0c2d2f30b
commit 02df33d1aa
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/printer/prt_escp.c
View File

@@ -87,7 +87,7 @@
#ifdef _WIN32 #ifdef _WIN32
# define PATH_FREETYPE_DLL "freetype.dll" # define PATH_FREETYPE_DLL "libfreetype-6.dll"
#else #else
# define PATH_FREETYPE_DLL "libfreetype.so.6" # define PATH_FREETYPE_DLL "libfreetype.so.6"
#endif #endif

12
src/printer/prt_ps.c
View File

@@ -44,11 +44,15 @@
#define gs_error_Quit -101 #define gs_error_Quit -101
#ifdef _WIN32 #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__ #elif defined __APPLE__
#define PATH_GHOSTSCRIPT_DLL "libgs.dylib" #define PATH_GHOSTSCRIPT_DLL "libgs.dylib"
#else #else
#define PATH_GHOSTSCRIPT_DLL "libgs.so" #define PATH_GHOSTSCRIPT_DLL "libgs.so.9"
#endif #endif
#define POSTSCRIPT_BUFFER_LENGTH 65536 #define POSTSCRIPT_BUFFER_LENGTH 65536
@@ -344,8 +348,6 @@ ps_init(void *lpt)
dev->ctrl = 0x04; dev->ctrl = 0x04;
dev->lpt = lpt; dev->lpt = lpt;
reset_ps(dev);
/* Try loading the DLL. */ /* Try loading the DLL. */
ghostscript_handle = dynld_module(PATH_GHOSTSCRIPT_DLL, ghostscript_imports); ghostscript_handle = dynld_module(PATH_GHOSTSCRIPT_DLL, ghostscript_imports);
if (ghostscript_handle == NULL) if (ghostscript_handle == NULL)
@@ -369,6 +371,8 @@ ps_init(void *lpt)
timer_add(&dev->pulse_timer, pulse_timer, dev, 0); timer_add(&dev->pulse_timer, pulse_timer, dev, 0);
timer_add(&dev->timeout_timer, timeout_timer, dev, 0); timer_add(&dev->timeout_timer, timeout_timer, dev, 0);
reset_ps(dev);
return(dev); return(dev);
} }

6
src/sound/midi_fluidsynth.c
View File

@@ -224,11 +224,15 @@ void* fluidsynth_init(const device_t *info)
/* Try loading the DLL. */ /* Try loading the DLL. */
#ifdef _WIN32 #ifdef _WIN32
# if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
fluidsynth_handle = dynld_module("libfluidsynth.dll", fluidsynth_imports); fluidsynth_handle = dynld_module("libfluidsynth.dll", fluidsynth_imports);
# else
fluidsynth_handle = dynld_module("libfluidsynth64.dll", fluidsynth_imports);
# endif
#elif defined __APPLE__ #elif defined __APPLE__
fluidsynth_handle = dynld_module("libfluidsynth.dylib", fluidsynth_imports); fluidsynth_handle = dynld_module("libfluidsynth.dylib", fluidsynth_imports);
#else #else
fluidsynth_handle = dynld_module("libfluidsynth.so", fluidsynth_imports); fluidsynth_handle = dynld_module("libfluidsynth.so.3", fluidsynth_imports);
#endif #endif
if (fluidsynth_handle == NULL) if (fluidsynth_handle == NULL)
{ {