From 7573288ab3ede23f97bff2f5caefcb622e7e9842 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 9 Mar 2009 23:42:07 +0000 Subject: svn merge -r113780:113785 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732 QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST improvements - combo merge --- indra/llrender/llglheaders.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 91a01a9266..c7178a5552 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -284,10 +284,12 @@ extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT; #if LL_LINUX && defined(WINGDIAPI) // WINGDIAPI gets set if we are using the linux nvidia gl.h header which needs // the functions below setting up. -# define LL_LINUX_NV_GL_HEADERS +# define LL_LINUX_NV_GL_HEADERS 1 +#else +# define LL_LINUX_NV_GL_HEADERS 0 #endif // LL_LINUX && defined(WINGDIAPI) -#ifdef LL_LINUX_NV_GL_HEADERS +#if LL_LINUX_NV_GL_HEADERS // Missing functions when using nvidia headers: extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB; extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB; -- cgit v1.2.3