Native compilation fixes

husker-dev · Nov 7, 2023 · 54ec6cd · 54ec6cd
1 parent aa592d4
commit 54ec6cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/native/src/openglfx.cpp b/native/src/openglfx.cpp
@@ -19,8 +19,9 @@ void* a_GetProcAddress(const char* name) {
         for(int i = 0; i < 2; i++)
             if((libGL = dlopen(NAMES[i], RTLD_NOW | RTLD_GLOBAL)) != NULL)
                 break;
+        a_gladGetProcAddress = (glXGetProcAddressPtr)dlsym(libGL, "glXGetProcAddressARB");
     }
-    void* procAddr = (void*)glXGetProcAddressARB((GLubyte*)name);
+    void* procAddr = (void*)a_gladGetProcAddress((GLubyte*)name);
     if(procAddr == NULL)
         procAddr = dlsym(libGL, name);
     return procAddr;

diff --git a/native/src/openglfx.h b/native/src/openglfx.h
@@ -43,9 +43,11 @@ extern wglDXUnlockObjectsNVPtr          wglDXUnlockObjectsNV;
 
 #elif defined(__linux__)
 #include <dlfcn.h>
-#include <GL/glx.h>
 static void* libGL;
 
+typedef void* (* glXGetProcAddressPtr)(const char*);
+static glXGetProcAddressPtr a_gladGetProcAddress;
+
 #elif defined(__APPLE__)
 #include <dlfcn.h>
 static void* libGL;