diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-02 20:22:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-02 20:23:57 +0100 |
| commit | fa50edeb728b4c3320b88a648f5144faf5e2c1b6 (patch) | |
| tree | 22dd212705c04c25f3c1fe81b55d03140595ede2 /vcl | |
| parent | 6efb7f65eea764ffe5b71f65f9b7eea125183ec3 (diff) | |
Remove references to unused GLU
(after removing the one remaining use of gluErrorString in a SAL_WARN call)
Change-Id: Ib94e346d73e508e69c07deafdc690e3ae0e23d4e
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Executable_icontest.mk | 1 | ||||
| -rw-r--r-- | vcl/Executable_mtfdemo.mk | 1 | ||||
| -rw-r--r-- | vcl/Executable_ui-previewer.mk | 1 | ||||
| -rw-r--r-- | vcl/Executable_vcldemo.mk | 1 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 1 | ||||
| -rw-r--r-- | vcl/StaticLibrary_glxtest.mk | 1 | ||||
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 2 |
8 files changed, 1 insertions, 8 deletions
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index 28b686bbd7e7..11cc69d086fc 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Executable_add_libs,icontest,\ -ldl \ -lpthread \ -lGL \ - -lGLU \ -lX11 \ )) diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk index 749547baa846..c52980b0e6a1 100644 --- a/vcl/Executable_mtfdemo.mk +++ b/vcl/Executable_mtfdemo.mk @@ -47,7 +47,6 @@ $(eval $(call gb_Executable_add_libs,mtfdemo,\ -ldl \ -lpthread \ -lGL \ - -lGLU \ -lX11 \ )) diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 665f683ee199..9aa4fa3bb0cb 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Executable_add_libs,ui-previewer,\ -ldl \ -lpthread \ -lGL \ - -lGLU \ -lX11 \ )) diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index 9d2e55e8ff09..da9d9e663c60 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Executable_add_libs,vcldemo,\ -ldl \ -lpthread \ -lGL \ - -lGLU \ -lX11 \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f96141e90c0c..a9430a5aeec3 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -707,7 +707,6 @@ $(eval $(call gb_Library_add_libs,vcl,\ -ldl \ -lpthread \ -lGL \ - -lGLU \ -lX11 \ )) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 29695e965539..9b216dddd0ff 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ -lSM \ -lICE \ -lGL \ - -lGLU \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk index 1e28775c8a1e..2ac2283897c4 100644 --- a/vcl/StaticLibrary_glxtest.mk +++ b/vcl/StaticLibrary_glxtest.mk @@ -34,7 +34,6 @@ $(eval $(call gb_StaticLibrary_add_libs,glxtest,\ -ldl \ -lpthread \ -lGL \ - -lGLU \ -lX11 \ )) diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 4a7edff5b330..f0bc5b47eb1b 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1257,7 +1257,7 @@ void OpenGLContext::reset() glXMakeCurrent(m_aGLWin.dpy, None, NULL); if( glGetError() != GL_NO_ERROR ) { - SAL_WARN("vcl.opengl", "glError: " << reinterpret_cast<char const *>(gluErrorString(glGetError()))); + SAL_WARN("vcl.opengl", "glError: " << glGetError()); } glXDestroyContext(m_aGLWin.dpy, m_aGLWin.ctx); |