diff --git a/components/raybri/raybri.c b/components/raybri/raybri.c index b3af940..fee19b8 100644 --- a/components/raybri/raybri.c +++ b/components/raybri/raybri.c @@ -8,23 +8,9 @@ static int sr_width = 1; static int sr_height = 1; static int sr_ready = 0; -// raylib is built as a static/dynamic library with GLFW baked in, but we never -// call InitWindow(). Instead we render into an OpenGL context owned by the -// macOS app, so we must supply the OpenGL entry point loader ourselves. -static void *sr_gl_loader(const char *name) -{ - static void *handle = NULL; - if (handle == NULL) - { - handle = dlopen(RAYBRI_MAC_GL, RTLD_LAZY | RTLD_LOCAL); - } - if (handle == NULL) return NULL; - return dlsym(handle, name); -} - void raybri_init(void) { //SetTraceLogLevel(LOG_WARNING); - rlLoadExtensions((void *)sr_gl_loader); + rlLoadExtensions((void *)raybri_gl_loader); // Init with default 1x1 size rlglInit(1, 1); rlClearColor(0, 0, 255, 255); diff --git a/components/raybri/raybriAux.c b/components/raybri/raybriAux.c new file mode 100644 index 0000000..3cd656f --- /dev/null +++ b/components/raybri/raybriAux.c @@ -0,0 +1,19 @@ +#include "raybriAux.h" +#include "raybriConst.h" + +// raylib is built as a static/dynamic library with GLFW baked in, but we never +// call InitWindow(). Instead we render into an OpenGL context owned by the +// macOS app, so we must supply the OpenGL entry point loader ourselves. +void *raybri_gl_loader(const char *name) { + static void *handle = NULL; + + if (handle == NULL) { + handle = dlopen(RAYBRI_MAC_GL, RTLD_LAZY | RTLD_LOCAL); + } + + if (handle == NULL) { + return NULL; + } + + return dlsym(handle, name); +} diff --git a/components/raybri/raybriAux.h b/components/raybri/raybriAux.h new file mode 100644 index 0000000..5b46f1e --- /dev/null +++ b/components/raybri/raybriAux.h @@ -0,0 +1,6 @@ +#ifndef RAYBRI_AUX_H +#define RAYBRI_AUX_H + +void *raybri_gl_loader(const char *name); + +#endif // RAYBRI_AUX_H diff --git a/ogs-blue/ver-mac/src/raybri/raybriAux.c b/ogs-blue/ver-mac/src/raybri/raybriAux.c new file mode 120000 index 0000000..377245e --- /dev/null +++ b/ogs-blue/ver-mac/src/raybri/raybriAux.c @@ -0,0 +1 @@ +../../../../components/raybri/raybriAux.c \ No newline at end of file diff --git a/ogs-blue/ver-mac/src/raybri/raybriAux.h b/ogs-blue/ver-mac/src/raybri/raybriAux.h new file mode 120000 index 0000000..1033d69 --- /dev/null +++ b/ogs-blue/ver-mac/src/raybri/raybriAux.h @@ -0,0 +1 @@ +../../../../components/raybri/raybriAux.h \ No newline at end of file