From 28e169363033aff7752382d790886eaadd4787f9 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 27 Feb 2013 15:32:37 +0000 Subject: Properly check GLX_INDIRECT_RENDERING in glapi/tests/check_table Actually use $DEFINES, so we can see if GLX_INDIRECT_RENDERING is defined If GLX_INDIRECT_RENDERING is defined, _GLAPI_SKIP_PROTO_ENTRY_POINTS will be defined, and libglapi won't contain the 'protocol entry points', so we should provide stubs in check_table.cpp --- src/mapi/glapi/tests/Makefile.am | 1 + src/mapi/glapi/tests/check_table.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mapi/glapi/tests/Makefile.am b/src/mapi/glapi/tests/Makefile.am index 3553b998a88..26149c902ac 100644 --- a/src/mapi/glapi/tests/Makefile.am +++ b/src/mapi/glapi/tests/Makefile.am @@ -1,6 +1,7 @@ if !HAVE_SHARED_GLAPI AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ + $(DEFINES) \ -I$(top_srcdir)/src/gtest/include \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/include diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp index dffec83270d..375645b9406 100644 --- a/src/mapi/glapi/tests/check_table.cpp +++ b/src/mapi/glapi/tests/check_table.cpp @@ -1511,7 +1511,7 @@ const struct name_offset known_dispatch[] = { { NULL, 0 } }; -#ifndef GLX_INDIRECT_RENDERING +#ifdef GLX_INDIRECT_RENDERING extern "C" { GLAPI GLboolean GLAPIENTRY glAreTexturesResidentEXT(GLsizei n, const GLuint *textures, -- cgit v1.2.3