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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_layout_test.mk | 1 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 1 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_uwriter.mk | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index a4400507428a..dd8af0c6fec4 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 72a7301a8dd9..385e0c196e7e 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \ )) $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ - avmedia \ basegfx \ comphelper \ cppu \ diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index 0b71cc1c9932..9c43d3dace5c 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -19,7 +19,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \ $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw)) $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ |