diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-05-12 16:30:26 +0100 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2015-02-11 00:25:34 -0800 |
| commit | b5c7d50daaf878ef234780285d24cb9032818a5a (patch) | |
| tree | ee18f40185742338beb1695b1bb34f48f65fedff | |
| parent | 9280d8353799867ae7804eee8a7ad429e1ed442f (diff) | |
applegl: Provide requirements of _SET_DrawBuffers10.4-darwin-build-fixes
_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with libmesa
for remap.c. libmesa requires the C++ linker.
Also need to arrange to call _mesa_init_remap_table() to initialize the remap
table.
XXX: There has to be a better way fixing this.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
(cherry picked from commit fd9583edffb17028253ecd267b21a137522d67e4)
| -rw-r--r-- | src/glx/Makefile.am | 5 | ||||
| -rw-r--r-- | src/glx/apple/apple_glapi.c | 3 |
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); |