diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-23 13:40:13 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-25 11:05:47 +0000 |
| commit | 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch) | |
| tree | 1482b9e0b899a783f64aaed3b9728533a81eff58 /vcl/Library_vcl.mk | |
| parent | 44a6d8ac3063511a149d4abdd6c2a556b3f477fe (diff) | |
fix headless build
disables OpenGL and glew usage, lets --without-gui do what
--without-x did before and disables X related test
Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb
Reviewed-on: https://gerrit.libreoffice.org/23474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 0ae75642cc80..0592dd5f77a8 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -113,7 +113,6 @@ endif $(eval $(call gb_Library_use_externals,vcl,\ boost_headers \ gio \ - glew \ glm_headers \ harfbuzz \ icu_headers \ @@ -121,20 +120,14 @@ $(eval $(call gb_Library_use_externals,vcl,\ lcms2 \ mdds_headers \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_use_externals,vcl,\ + glew \ + )) +endif $(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/opengl/DeviceInfo \ - vcl/opengl/gdiimpl \ - vcl/opengl/salbmp \ - vcl/opengl/scale \ - vcl/opengl/framebuffer \ - vcl/opengl/program \ - vcl/opengl/texture \ - vcl/opengl/FixedTextureAtlas \ - vcl/source/opengl/OpenGLContext \ - vcl/source/opengl/OpenGLHelper \ vcl/source/window/cairo_cairo \ - vcl/source/window/openglwin \ vcl/source/window/settings \ vcl/source/window/paint \ vcl/source/window/resource \ @@ -613,9 +606,32 @@ $(eval $(call gb_Library_use_externals,vcl,\ freetype \ )) ifneq ($(OS),EMSCRIPTEN) - $(eval $(call gb_Library_use_externals,vcl,\ - fontconfig \ - )) +$(eval $(call gb_Library_use_externals,vcl,\ + fontconfig \ +)) +endif +else + $(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/opengl/DeviceInfo \ + vcl/opengl/gdiimpl \ + vcl/opengl/salbmp \ + vcl/opengl/scale \ + vcl/opengl/framebuffer \ + vcl/opengl/program \ + vcl/opengl/texture \ + vcl/opengl/FixedTextureAtlas \ + vcl/source/opengl/OpenGLContext \ + vcl/source/opengl/OpenGLHelper \ + vcl/source/window/openglwin \ + )) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,vcl,\ + -lm \ + -ldl \ + -lpthread \ + -lGL \ + -lX11 \ +)) endif endif @@ -727,11 +743,12 @@ $(eval $(call gb_Library_add_libs,vcl,\ -lX11 \ -lXext \ )) - +ifneq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/opengl/x11/X11DeviceInfo \ )) endif +endif # Runtime dependency for unit-tests $(eval $(call gb_Library_use_restarget,vcl,vcl)) |