mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use HAVE_DYLIB for loading dynamic libraries instead of HAVE_DYNAMIC

Browse Source
This commit is contained in:
libretroadmin 2022-11-21 05:23:43 +01:00
parent e71a5ff921
commit 3b38ea195f
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/angle_common.c
View File

@ -89,7 +89,7 @@ static bool angle_try_initialize(egl_ctx_data_t* egl,
EGLint* major, EGLint* minor) EGLint* major, EGLint* minor)
{ {
EGLDisplay dpy = EGL_NO_DISPLAY; EGLDisplay dpy = EGL_NO_DISPLAY;
#if defined(HAVE_DYNAMIC) && defined(HAVE_DYNAMIC_EGL) #if defined(HAVE_DYLIB) && defined(HAVE_DYNAMIC_EGL)
if (!egl_init_dll()) if (!egl_init_dll())
return false; return false;
#endif #endif

4
gfx/common/egl_common.c
View File

@ -40,7 +40,7 @@ bool g_egl_inited = false;
unsigned g_egl_major = 0; unsigned g_egl_major = 0;
unsigned g_egl_minor = 0; unsigned g_egl_minor = 0;
#if defined(HAVE_DYNAMIC) && defined(HAVE_DYNAMIC_EGL) #if defined(HAVE_DYLIB) && defined(HAVE_DYNAMIC_EGL)
#include <dynamic/dylib.h> #include <dynamic/dylib.h>
typedef EGLBoolean(* PFN_EGL_QUERY_SURFACE)( typedef EGLBoolean(* PFN_EGL_QUERY_SURFACE)(
@ -124,7 +124,7 @@ static PFN_EGL_SWAP_INTERVAL _egl_swap_interval;
bool egl_init_dll(void) bool egl_init_dll(void)
{ {
#if defined(HAVE_DYNAMIC) && defined(HAVE_DYNAMIC_EGL) #if defined(HAVE_DYLIB) && defined(HAVE_DYNAMIC_EGL)
static dylib_t egl_dll; static dylib_t egl_dll;
if (!egl_dll) if (!egl_dll)

6
gfx/common/wayland_common.c
View File

@ -467,11 +467,9 @@ bool gfx_ctx_wl_init_common(
if (!wl) if (!wl)
return false; return false;
#ifdef HAVE_LIBDECOR_H #ifdef HAVE_LIBDECOR_H
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYLIB
wl->libdecor = dylib_load("libdecor-0.so"); if ((wl->libdecor = dylib_load("libdecor-0.so")))
if (wl->libdecor)
{ {
#define RA_WAYLAND_SYM(rc,fn,params) wl->fn = (rc (*) params)dylib_proc(wl->libdecor, #fn); #define RA_WAYLAND_SYM(rc,fn,params) wl->fn = (rc (*) params)dylib_proc(wl->libdecor, #fn);
#include "wayland/libdecor_sym.h" #include "wayland/libdecor_sym.h"