diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-13 16:38:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-13 19:26:02 +0200 |
| commit | 0b49cc5b03b39aa1dfddf924c6eaf8cb42e791a8 (patch) | |
| tree | 18f314ea963caea72449e93cf02b326a6cce3d10 /Repository.mk | |
| parent | 02315362782d6d28c9d5f8bfcce278cdbee0e98b (diff) | |
scp2: move basebmp, avmediaQuickTime, avmediaMacAVF libs to AutoInstall
Change-Id: I1b7a8fd5272cb56b2a45c89de79165cfd71711c4
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index 9e1410314b7d..dc2b36bac09d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -226,8 +226,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ acc \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ + $(if $(filter MACOSX,$(OS)),\ + $(if $(filter-out 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \ + $(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \ + ) \ $(if $(DISABLE_SCRIPTING),,basctl) \ $(if $(DISABLE_SCRIPTING),,basprov) \ + $(if $(filter $(OS),ANDROID),, \ + basebmp \ + ) \ basegfx \ bib \ $(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \ @@ -423,14 +430,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ agg \ - $(if $(filter $(OS),ANDROID),, \ - basebmp \ - ) \ communi \ ooxml \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbc) \ - avmediaMacAVF \ - avmediaQuickTime \ filtertracer \ rpt \ rptui \ |