Fix build on apple

src/detection/displayserver/displayserver_apple.c

@@ -32,10 +32,7 @@ static void detectResolution(FFDisplayServerResult* ds)
     CGDisplayCount screenCount;
     CGGetOnlineDisplayList(INT_MAX, NULL, &screenCount);
     if(screenCount == 0)
-    {
-        dlclose(cg);
         return;
-    }
 
     CGDirectDisplayID* screens = malloc(screenCount * sizeof(CGDirectDisplayID));
     CGGetOnlineDisplayList(INT_MAX, screens, &screenCount);

src/detection/gpu/gpu_apple.c

@@ -27,10 +27,7 @@ void ffDetectGPUImpl(FFlist* gpus, const FFinstance* instance)
     CFMutableDictionaryRef matchDict = IOServiceMatching("IOPCIDevice");
     io_iterator_t iterator;
     if(IOServiceGetMatchingServices(0, matchDict, &iterator) != kIOReturnSuccess)
-    {
-        dlclose(iokit);
         return;
-    }
 
     io_registry_entry_t registryEntry;
     while((registryEntry = IOIteratorNext(iterator)) != 0)

src/modules/opengl.c

@@ -341,6 +341,8 @@ static const char* osMesaPrint(FFinstance* instance)
 
 #ifdef __APPLE__
 
+#include <OpenGL/OpenGL.h> // This brings in CGL, not GL
+
 typedef struct CGLData
 {
     CGLPixelFormatObj pixelFormat;
@@ -370,6 +372,8 @@ static const char* cglHandlePixelFormat(FFinstance* instance, CGLData* data)
 
 static const char* cglPrint(FFinstance* instance)
 {
+    CGLData data;
+
     CGLPixelFormatAttribute attrs[] = {
         kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core,
         kCGLPFAAccelerated,
@@ -377,11 +381,11 @@ static const char* cglPrint(FFinstance* instance)
     };
 
     GLint num;
-    if (CGLChoosePixelFormat(attrs, &data->pixelFormat, &num) != kCGLNoError)
+    if (CGLChoosePixelFormat(attrs, &data.pixelFormat, &num) != kCGLNoError)
         return "CGLChoosePixelFormat() failed";
 
-    const char* error = cglHandlePixelFormat(instance, data);
-    CGLDestroyPixelFormat(data->pixelFormat);
+    const char* error = cglHandlePixelFormat(instance, &data);
+    CGLDestroyPixelFormat(data.pixelFormat);
     return error;
 }