avmedia/Library_avmedia.mk | 2 --
avmedia/Module_avmedia.mk | 2 --
configure.ac | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 0bb43aabab4fe772d2be7dfe3cc228473da19c2d
Author: Oliver Specht <oliver.spe...@cib.de>
Date: Wed Mar 30 09:18:58 2016 +0200
headless build: reset ENABLE_GLTF and use that setting as before
Change-Id: Iea54c59393c7c2955ec5fa321d9e9ea7b57b198a
Reviewed-on: https://gerrit.libreoffice.org/23831
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.spe...@cib.de>
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index f091822..6a0c35b 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 db5fcae..fb9497d 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 7ee051c..d8f67a2 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
