From 5a459a036e33683410bab4df431ed553bd0eeb66 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Mon, 12 May 2014 10:47:07 +0100 Subject: Fix build of appleglx Define GLX_USE_APPLEGL, as config/darwin used to, to turn on specific code to use the applegl direct renderer Convert src/glx/apple/Makefile to automake Since the applegl libGL is now built by linking libappleglx into libGL, rather than by linking selected files into a special libGL: - Remove duplicate code in apple/glxreply.c and apple/apple_glx.c. This makes apple/glxreply.c empty, so remove it - Some indirect rendering code is already guarded by !GLX_USE_APPLEGL, but we need to add those guards to indirect_glx.c, indirect_init.c (via it's generator), render2.c and vertarr.c so they don't generate anything Fix and update various includes glapi_gentable.c (which is only used on darwin), should be included in shared glapi as well, to provide _glapi_create_table_from_handle() Note that neither swrast nor indirect is supported in the APPLEGL path at the moment, which makes things more complex than they need to be. More untangling is needed to allow that v2: Correct apple/Makefile.am for srcdir != builddir Signed-off-by: Jon TURNEY Reviewed-by: Jeremy Huddleston Sequoia Reviewed-by: Emil Velikov --- src/glx/glxcurrent.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/glx/glxcurrent.c') diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c index 2e5111b8cf7..dc2acd5e2ab 100644 --- a/src/glx/glxcurrent.c +++ b/src/glx/glxcurrent.c @@ -38,12 +38,6 @@ #endif #include "glxclient.h" -#ifdef GLX_USE_APPLEGL -#include - -#include "apple_glx.h" -#include "apple_glx_context.h" -#endif #include "glapi.h" -- cgit v1.2.3