diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
| commit | c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 (patch) | |
| tree | c735cd065521eb5b2d719f78e1685c090b265ea6 /indra/llrender | |
| parent | 8c0aa31536c447edb6ef4fbee43f99debf593a20 (diff) | |
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index f31446924f..3ba2722201 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -3,7 +3,7 @@ project(llrender) include(00-Common) -include(FindOpenGL) +include(OpenGL) include(FreeType) include(LLCommon) include(LLImage) diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index e28e3157d2..c65d68e64e 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -389,7 +389,7 @@ PFNGLACTIVETEXTUREARBPROC glActiveTextureARB = NULL; PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB = NULL; PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements = NULL; #endif // LL_LINUX_NV_GL_HEADERS -#endif +#endif // (LL_WINDOWS || LL_LINUX || LL_SOLARIS) && !LL_MESA_HEADLESS LLGLManager gGLManager; |