[Libreoffice-commits] core.git: canvas/Library_oglcanvas.mk desktop/Library_sofficeapp.mk RepositoryExternal.mk slideshow/Library_OGLTrans.mk svx/Executable_gengal.mk sw/Executable_tiledrendering.mk vcl/Executable_icontest.mk vcl/Executable_mtfdemo.mk vcl/Executable_ui-previewer.mk vcl/Executable_vcldemo.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/source vcl/StaticLibrary_glxtest.mk
Stephan Bergmann
sbergman at redhat.com
Mon Mar 2 11:24:28 PST 2015
RepositoryExternal.mk | 1 +
canvas/Library_oglcanvas.mk | 1 -
desktop/Library_sofficeapp.mk | 1 -
slideshow/Library_OGLTrans.mk | 1 -
svx/Executable_gengal.mk | 1 -
sw/Executable_tiledrendering.mk | 1 -
vcl/Executable_icontest.mk | 1 -
vcl/Executable_mtfdemo.mk | 1 -
vcl/Executable_ui-previewer.mk | 1 -
vcl/Executable_vcldemo.mk | 1 -
vcl/Library_vcl.mk | 1 -
vcl/Library_vclplug_gen.mk | 1 -
vcl/StaticLibrary_glxtest.mk | 1 -
vcl/source/opengl/OpenGLContext.cxx | 2 +-
14 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit fa50edeb728b4c3320b88a648f5144faf5e2c1b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 2 20:22:42 2015 +0100
Remove references to unused GLU
(after removing the one remaining use of gluErrorString in a SAL_WARN call)
Change-Id: Ib94e346d73e508e69c07deafdc690e3ae0e23d4e
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6c146eb..44036dd 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 589e601..7f859f6 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 241be85..985e55e 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 809ca14..f5f4676 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 6e8bda1..38d5697 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 f5664da..0446a97 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 28b686b..11cc69d 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 749547b..c52980b 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 665f683..9aa4fa3 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 9d2e55e..da9d9e6 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 f96141e..a9430a5 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 29695e9..9b216dd 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 1e28775..2ac2283 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 4a7edff..f0bc5b4 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);
More information about the Libreoffice-commits
mailing list