diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-19 17:32:31 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-19 18:10:13 +0200 |
| commit | 5f6fd413a301d58c50ccb1b7558d78477e0105df (patch) | |
| tree | 12a81de08b301bbd50403929d2543a80e8f3a055 | |
| parent | e6ac418db5a1714bdbfa743e3432dac8b8728693 (diff) | |
avmediaogl: build depends on ENABLE_GLTF instead
Change-Id: I03d0d7c0446b6316e388ae717aded6bb7dcc88f1
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index e255636eb864..e8412a27ed70 100644 --- a/Repository.mk +++ b/Repository.mk @@ -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 \ diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index b1b6703c6c9f..4a80ad9ddc0b 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -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 \ )) diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 8053b7d3b969..5a4b104a3b19 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -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))) |