diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-18 00:05:44 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-18 00:07:20 +0300 |
| commit | be862ff4f7239497625125067c646bf5adab7741 (patch) | |
| tree | 8d5b2ff0e038e20dbe00c32f0429e5b906f84401 /sd | |
| parent | 629cc605a45e75d6896b524eada2354c1d4d33a8 (diff) | |
Try making it possible to use --disable-avmedia for desktop platforms too
Unfinished work in progress.
Change-Id: I978755d73630b8653b169a53f937c1332799e22e
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 1 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_html_export_tests.mk | 1 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_import_tests.mk | 2 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 45c29aadf788..646b112b09d5 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_add_defs,sd_filters_test,\ endif $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index 4fcc6807dabf..457e90775a57 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_html_export_tests, \ )) $(eval $(call gb_CppunitTest_use_libraries,sd_html_export_tests, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk index 3661de715dde..ce8ad634bb57 100644 --- a/sd/CppunitTest_sd_import_tests.mk +++ b/sd/CppunitTest_sd_import_tests.mk @@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests, \ )) $(eval $(call gb_CppunitTest_use_libraries,sd_import_tests, \ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index ad43f7ee0a4b..b4fe76aa5f06 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_uimpress,\ $(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd)) $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ canvastools \ comphelper \ |