From 6b6d315219c85e09d6e8f0d7bf6db38081bedb81 Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Mon, 25 Jan 2021 22:47:34 -0500 Subject: [PATCH] Remove GLU header --- indra/cmake/OpenGL.cmake | 1 - indra/llrender/llglheaders.h | 7 ------- 2 files changed, 8 deletions(-) diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index ea6474cf2df..470705c6905 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -4,7 +4,6 @@ include(Variables) include(Prebuilt) if (BUILD_HEADLESS) - SET(OPENGL_glu_LIBRARY GLU) SET(OPENGL_HEADLESS_LIBRARIES OSMesa16 dl GLU) endif (BUILD_HEADLESS) diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index c773fd62bce..20b82e462d6 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -34,7 +34,6 @@ #define GL_GLEXT_PROTOTYPES 1 #include "GL/gl.h" #include "GL/glext.h" -#include "GL/glu.h" // The __APPLE__ kludge is to make glh_extensions.h not symbol-clash horribly # define __APPLE__ @@ -54,12 +53,6 @@ #include "epoxy/glx.h" #endif -#if LL_DARWIN -#include <OpenGL/glu.h> -#else -#include <GL/glu.h> -#endif - #endif // LL_MESA #endif // LL_LLGLHEADERS_H -- GitLab