Try to unify linux and apple code paths

This commit is contained in:
Linus Dierheimer
2022-09-14 12:41:43 +02:00
parent 50bb06535c
commit 52275b89dc
7 changed files with 106 additions and 97 deletions
+3 -2
View File
@@ -211,6 +211,7 @@ static void defaultConfig(FFinstance* instance)
ffStrbufInitA(&instance->config.libEGL, 0);
ffStrbufInitA(&instance->config.libGLX, 0);
ffStrbufInitA(&instance->config.libOSMesa, 0);
ffStrbufInitA(&instance->config.libCGL, 0);
ffStrbufInitA(&instance->config.libOpenCL, 0);
instance->config.titleFQDN = false;
@@ -430,8 +431,8 @@ void ffListFeatures()
#ifdef FF_HAVE_OSMESA
"osmesa\n"
#endif
#ifdef FF_HAVE_APPLECGL
"apple-cgl\n"
#ifdef FF_HAVE_CGL
"cgl\n"
#endif
#ifdef FF_HAVE_OPENCL
"opencl\n"
+1 -1
View File
@@ -6,7 +6,7 @@
static void* libraryLoad(const char* path, int maxVersion)
{
void* result = dlopen(path, RTLD_LAZY);
if(result != NULL)
if(result != NULL || maxVersion < 0)
return result;
FFstrbuf pathbuf;