Kaydet (Commit) 5f6fd413 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

avmediaogl: build depends on ENABLE_GLTF instead

Change-Id: I03d0d7c0446b6316e388ae717aded6bb7dcc88f1
üst e6ac418d
......@@ -500,7 +500,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_GSTREAMER),avmediagst) \
$(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
$(if $(ENABLE_DIRECTX),avmediawin) \
$(if $(ENABLE_OPENGL),avmediaogl) \
$(if $(ENABLE_GLTF),avmediaogl) \
cached1 \
collator_data \
comphelper \
......
......@@ -51,7 +51,7 @@ $(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 \
))
......
......@@ -218,7 +218,6 @@ $(eval $(call gb_Rdb_add_components,services,\
) \
$(if $(ENABLE_OPENGL), \
slideshow/source/engine/OGLTrans/ogltrans \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
) \
$(if $(ENABLE_TDE), \
shell/source/backends/kdebe/tdebe1 \
......@@ -233,6 +232,9 @@ $(eval $(call gb_Rdb_add_components,services,\
wizards/com/sun/star/wizards/report/report \
wizards/com/sun/star/wizards/table/table \
) \
$(if $(ENABLE_GLTF), \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
) \
))
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment