From 1f68d2beb6316899dd5b79bf8fc4cc796bbd031f Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Tue, 22 Jul 2014 11:18:59 +0000 Subject: [PATCH] Apply/replicate patches from OpenBSD to dlopen .so names. git-svn-id: https://svn.eduke32.com/eduke32@4545 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/dynamicgtk.c | 9 ++++++++- polymer/eduke32/build/src/glbuild.c | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/build/src/dynamicgtk.c b/polymer/eduke32/build/src/dynamicgtk.c index c8df161a7..cbfd82199 100644 --- a/polymer/eduke32/build/src/dynamicgtk.c +++ b/polymer/eduke32/build/src/dynamicgtk.c @@ -17,10 +17,17 @@ int32_t dynamicgtk_init(void) { int32_t err = 0; const char *failsym = NULL; + const char *gtk_shared_object; if (handle) return 1; - handle = dlopen("libgtk-x11-2.0.so.0", RTLD_NOW|RTLD_GLOBAL); +#if defined __OpenBSD__ + gtk_shared_object = "libgtk-x11-2.0.so"; +#else + gtk_shared_object = "libgtk-x11-2.0.so.0"; +#endif + + handle = dlopen(gtk_shared_object, RTLD_NOW|RTLD_GLOBAL); if (!handle) return -1; memset(&dynamicgtksyms, 0, sizeof(dynamicgtksyms)); diff --git a/polymer/eduke32/build/src/glbuild.c b/polymer/eduke32/build/src/glbuild.c index f9c363d19..0113faabd 100644 --- a/polymer/eduke32/build/src/glbuild.c +++ b/polymer/eduke32/build/src/glbuild.c @@ -350,6 +350,8 @@ int32_t loadgldriver(const char *driver) driver = "opengl32.dll"; #elif defined __APPLE__ driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; +#elif defined __OpenBSD__ + driver = "libGL.so"; #else driver = "libGL.so.1"; #endif @@ -962,6 +964,8 @@ int32_t loadglulibrary(const char *driver) driver = "glu32.dll"; #elif defined __APPLE__ driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; // FIXME: like I know anything about Apple. Hah. +#elif defined __OpenBSD__ + driver = "libGLU.so"; #else driver = "libGLU.so.1"; #endif