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 /scp2 | |
| parent | 02315362782d6d28c9d5f8bfcce278cdbee0e98b (diff) | |
scp2: move basebmp, avmediaQuickTime, avmediaMacAVF libs to AutoInstall
Change-Id: I1b7a8fd5272cb56b2a45c89de79165cfd71711c4
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 29 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 06c0e1e6de61..f756a8b64308 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -92,35 +92,6 @@ End #endif -#ifdef MACOSX - -#ifndef ENABLE_MACOSX_SANDBOX -File gid_File_Lib_avmediaQuickTime - PACKED_LIB_FILE_BODY; - Name = LIBNAME(avmediaQuickTime); -End -#endif - -#if MAXOSX_SDK_VERSION >= 1070 -File gid_File_Lib_avmediaMacAVF - PACKED_LIB_FILE_BODY; - Name = LIBNAME(avmediaMacAVF); -End -#endif - -#endif - -#if defined(MACOSX) -File gid_File_Lib_Basebmp - Name = LIBNAME(basebmp); - PACKED_LIB_FILE_BODY; -End -#endif - -#if defined UNX && ! defined MACOSX -STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) -#endif - #if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building //we need the nss libs for libxmlsec (or if the internal mozilla is enabled) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 6b36645d6ed1..e01c2c3b3ee5 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -129,7 +129,6 @@ Module gid_Module_Root_Files_4 auto_ooobinarytable_ALL, gid_File_Lib_Bib, gid_File_Lib_J, - gid_File_Lib_BaseBmp, gid_File_Lib_Zip); End |