avmediaogl now seems to require ENABLE_GLTF for some reason

Change-Id: Id5b65b944ed06598238f5ab139c52d4de5ca1f84
2016-03-28 11:20:52 +03:00
parent d31a6e7747
commit e9c9110748
2 changed files with 5 additions and 2 deletions
@@ -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:
@@ -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) \
+		) \
 	) \
 ))