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 /avmedia/Library_avmedia.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 'avmedia/Library_avmedia.mk')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index b8809f7b0967..f09182257d0d 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -25,9 +25,15 @@ $(eval $(call gb_Library_add_defs,avmedia,\ $(eval $(call gb_Library_use_externals,avmedia,\ boost_headers \ - glew \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_use_externals,avmedia,\ + glew \ +)) +endif + + $(eval $(call gb_Library_use_libraries,avmedia,\ comphelper \ ucbhelper \ @@ -45,10 +51,12 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ )) ifeq ($(ENABLE_GLTF),TRUE) +ifeq ($(ENABLE_OPENGL),TRUE) $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/framework/modeltools \ )) endif +endif ifeq ($(ENABLE_COLLADA),TRUE) |