From e9c911074849c3729a8f5023b9db209801a8c4af Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 27 Mar 2016 12:10:46 +0300 Subject: avmediaogl now seems to require ENABLE_GLTF for some reason Change-Id: Id5b65b944ed06598238f5ab139c52d4de5ca1f84 --- avmedia/Module_avmedia.mk | 3 ++- postprocess/Rdb_services.mk | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index ff5ba90bda98..db5fcae1bd2f 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -56,10 +56,11 @@ $(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/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 8f3405b49021..c411fc193e50 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -230,7 +230,9 @@ $(eval $(call gb_Rdb_add_components,services,\ wizards/com/sun/star/wizards/table/table \ ) \ $(if $(ENABLE_OPENGL), \ - $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \ + $(if $(ENABLE_GLTF), \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \ + ) \ ) \ )) -- cgit v1.2.3