diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-30 09:18:58 +0200 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-04-05 12:11:50 +0000 |
| commit | 0bb43aabab4fe772d2be7dfe3cc228473da19c2d (patch) | |
| tree | 3d996ff5d9d99682c539eca4bc5bc2e27fae63f3 | |
| parent | bc504b08f008b1813a29bb90c226340407c2077b (diff) | |
headless build: reset ENABLE_GLTF and use that setting as before
Change-Id: Iea54c59393c7c2955ec5fa321d9e9ea7b57b198a
Reviewed-on: https://gerrit.libreoffice.org/23831
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
| -rw-r--r-- | avmedia/Library_avmedia.mk | 2 | ||||
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index f09182257d0d..6a0c35bd87a4 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -51,12 +51,10 @@ $(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) diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index db5fcae1bd2f..fb9497d512dc 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -55,12 +55,10 @@ $(eval $(call gb_Module_add_targets,avmedia,\ )) endif -ifeq ($(ENABLE_OPENGL),TRUE) ifeq ($(ENABLE_GLTF),TRUE) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaogl \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/configure.ac b/configure.ac index 7ee051c8b766..d8f67a2528f4 100644 --- a/configure.ac +++ b/configure.ac @@ -10463,7 +10463,7 @@ dnl Check whether to enable glTF support dnl =================================================================== AC_MSG_CHECKING([whether to enable glTF support]) ENABLE_GLTF= -if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android; then +if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android -a "$ENABLE_HEADLESS" = ""; then ENABLE_GLTF=TRUE AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FEATURE_GLTF,1) |