diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-20 09:52:03 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-20 13:50:51 +0100 |
| commit | a55f740045d6d30e1ef5522889d2dc359ca5784a (patch) | |
| tree | cf05fa9cd35419dc488e96f23c67d4eb308f71e0 /desktop/Library_sofficeapp.mk | |
| parent | dcdc8df2e6d740dd75ff6e28727ca757e4882f86 (diff) | |
include the unx part for getting OpenGL driver & device information
desktop/unx/source/glxtest.cxx is taken directly from the Mozilla
project.
THe whole concept is taken from Mozilla and is based on starting an
early process that creates an OpenGL context. This prevents crashing
drivers to crash Libreoffice.
We read the information from the pipe as soon as we create the first vcl
Window. In that place we then decide if the device/driver combination is
blacklisted.
Change-Id: I2624d4ce06d503281a4459cf3174f57cf1f7b733
Diffstat (limited to 'desktop/Library_sofficeapp.mk')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index be86dd10e663..f322a6ca74b6 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -94,6 +94,21 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/migration/migration \ )) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_exception_objects,sofficeapp,\ + desktop/unx/source/glxtest \ +)) + +$(eval $(call gb_Library_add_libs,sofficeapp,\ + -lm \ + -ldl \ + -lpthread \ + -lGL \ + -lGLU \ + -lX11 \ +)) +endif + # liblibreoffice bits $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/init \ |