summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/glx/Makefile.am5
-rw-r--r--src/glx/apple/apple_glapi.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 451531237f..33a6c526a4 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -118,7 +118,10 @@ libglx_la_SOURCES += \
applegl_glx.c
SUBDIRS += apple
-libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
+libglx_la_LIBADD += \
+ $(builddir)/apple/libappleglx.la \
+ $(top_builddir)/src/mesa/libmesa.la
+nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
endif
GL_LIBS = \
diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
index 4d19f7f6a3..849044bb8e 100644
--- a/src/glx/apple/apple_glapi.c
+++ b/src/glx/apple/apple_glapi.c
@@ -39,6 +39,7 @@
#include <GL/gl.h>
#include "main/glheader.h"
+#include "main/remap.h"
#include "glapi.h"
#include "glapitable.h"
#include "main/dispatch.h"
@@ -54,6 +55,8 @@ static void _apple_glapi_create_table(void) {
if (__applegl_api)
return;
+ _mesa_init_remap_table();
+
__ogl_framework_api = _glapi_create_table_from_handle(apple_cgl_get_dl_handle(), "gl");
assert(__ogl_framework_api);