Remove references to unused GLU

(after removing the one remaining use of gluErrorString in a SAL_WARN call)

Change-Id: Ib94e346d73e508e69c07deafdc690e3ae0e23d4e

14 files changed, 2 insertions, 13 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6c146eb6646d..44036ddbb1cb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -265,6 +265,7 @@ define gb_LinkTarget__use_glew
 $(call gb_LinkTarget_use_package,$(1),glew)
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,glew/include) \
+	-DGLEW_NO_GLU \
 	$$(INCLUDE) \
 )
 
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index 589e6011f3c2..7f859f696e5d 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_Library_use_system_win32_libs,oglcanvas,\
 else
 $(eval $(call gb_Library_add_libs,oglcanvas,\
     -lGL \
-    -lGLU \
     -lX11 \
 ))
 endif
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 241be850a980..985e55eadfc0 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\
 	-ldl \
 	-lpthread \
     -lGL \
-    -lGLU \
     -lX11 \
 ))
 endif
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 809ca1486573..f5f4676677e6 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Library_add_exception_objects,OGLTrans,\
 
 $(eval $(call gb_Library_add_libs,OGLTrans,\
 	-lGL \
-	-lGLU \
 	-lX11 \
 ))
 endif
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index 6e8bda1de304..38d5697f32a2 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Executable_add_libs,gengal,\
 	-ldl \
 	-lpthread \
     -lGL \
-    -lGLU \
     -lX11 \
 ))
 
diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk
index f5664dae17d9..0446a97cb77c 100644
--- a/sw/Executable_tiledrendering.mk
+++ b/sw/Executable_tiledrendering.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Executable_add_libs,tiledrendering,\
 	-ldl \
 	-lpthread \
     -lGL \
-    -lGLU \
     -lX11 \
 ))
 
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);