desktop/Library_sofficeapp.mk | 4
desktop/unx/source/glxtest.cxx | 282 ----------------------------------------
include/vcl/opengl/glxtest.hxx | 2
svx/Executable_gengal.mk | 7
sw/Executable_tiledrendering.mk | 16 ++
vcl/Executable_icontest.mk | 9 +
vcl/Executable_ui-previewer.mk | 15 ++
vcl/Executable_vcldemo.mk | 15 ++
vcl/Module_vcl.mk | 1
vcl/StaticLibrary_glxtest.mk | 45 ++++++
vcl/source/salmain/salmain.cxx | 7
vcl/unx/glxtest.cxx | 280 +++++++++++++++++++++++++++++++++++++++
12 files changed, 399 insertions(+), 284 deletions(-)
New commits:
commit bcd8f9e265faaca5905feb6bdd79e63161909368
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Nov 21 12:45:51 2014 +0100
make glxtest available in salmain
Change-Id: Ic8bc3f2d5d96506590d35138089ead2eac984314
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index f322a6c..da37f9a 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -95,8 +95,8 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
- desktop/unx/source/glxtest \
+$(eval $(call gb_Library_use_static_libraries,sofficeapp,\
+ glxtest \
))
$(eval $(call gb_Library_add_libs,sofficeapp,\
diff --git a/include/vcl/opengl/glxtest.hxx b/include/vcl/opengl/glxtest.hxx
index 0889cdd..687038f 100644
--- a/include/vcl/opengl/glxtest.hxx
+++ b/include/vcl/opengl/glxtest.hxx
@@ -16,6 +16,8 @@ VCL_DLLPUBLIC int* getGlxPipe();
VCL_DLLPUBLIC pid_t* getGlxPid();
+bool fire_glxtest_process();
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index 55cc2f1..17a57dc 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -65,6 +65,13 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,gengal,\
-ldl \
-lpthread \
+ -lGL \
+ -lGLU \
+ -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,gengal,\
+ glxtest \
))
endif
diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk
index 089b0f5..f5664da 100644
--- a/sw/Executable_tiledrendering.mk
+++ b/sw/Executable_tiledrendering.mk
@@ -42,4 +42,20 @@ $(eval $(call
gb_Executable_add_exception_objects,tiledrendering,\
sw/qa/tiledrendering/tiledrendering \
))
+ifeq ($(OS),LINUX)
+
+$(eval $(call gb_Executable_add_libs,tiledrendering,\
+ -lm \
+ -ldl \
+ -lpthread \
+ -lGL \
+ -lGLU \
+ -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,tiledrendering,\
+ glxtest \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index d7962d8..00dc906 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -24,7 +24,16 @@ $(eval $(call gb_Executable_use_api,icontest,\
ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,icontest,\
+ -lm \
+ -ldl \
+ -lpthread \
-lGL \
+ -lGLU \
+ -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,icontest,\
+ glxtest \
))
else ifeq ($(OS),WNT)
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index 444ded1..665f683 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -34,4 +34,19 @@ $(eval $(call
gb_Executable_add_exception_objects,ui-previewer,\
vcl/source/uipreviewer/previewer \
))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_libs,ui-previewer,\
+ -lm \
+ -ldl \
+ -lpthread \
+ -lGL \
+ -lGLU \
+ -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\
+ glxtest \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 721605f..44f13b2 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -41,4 +41,19 @@ $(eval $(call gb_Executable_use_static_libraries,vcldemo,\
vclmain \
))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_libs,vcldemo,\
+ -lm \
+ -ldl \
+ -lpthread \
+ -lGL \
+ -lGLU \
+ -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,vcldemo,\
+ glxtest \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 5d1d2d2..01db2e7 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_gen \
Library_desktop_detector \
StaticLibrary_headless \
+ StaticLibrary_glxtest \
Package_fontunxppds \
Package_fontunxpsprint \
))
diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk
new file mode 100644
index 0000000..1e28775
--- /dev/null
+++ b/vcl/StaticLibrary_glxtest.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,glxtest))
+
+$(eval $(call gb_StaticLibrary_set_include,glxtest,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_StaticLibrary_use_api,glxtest,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_libs,glxtest,\
+ -lm \
+ -ldl \
+ -lpthread \
+ -lGL \
+ -lGLU \
+ -lX11 \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,glxtest,\
+ vcl/unx/glxtest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index 7f0f90a..e7318e8 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.cxx
@@ -28,7 +28,14 @@
#include "salinst.hxx"
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
+#include <vcl/opengl/glxtest.hxx>
+#endif
+
SAL_IMPLEMENT_MAIN() {
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
+ fire_glxtest_process();
+#endif
tools::extendApplicationEnvironment();
vclmain::createApplication();
return SVMain();
diff --git a/desktop/unx/source/glxtest.cxx b/vcl/unx/glxtest.cxx
similarity index 99%
rename from desktop/unx/source/glxtest.cxx
rename to vcl/unx/glxtest.cxx
index df9603a..d1f9591 100644
--- a/desktop/unx/source/glxtest.cxx
+++ b/vcl/unx/glxtest.cxx
@@ -5,8 +5,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "app.hxx"
-
//////////////////////////////////////////////////////////////////////////////
//
// Explanation: See bug 639842. Safely getting GL driver info on X11 is hard,
because the only way to do
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
