diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-14 11:23:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-14 12:29:47 +0100 |
| commit | e759269e373fa02d3e8566d1edc9fb9526de6640 (patch) | |
| tree | aebd0c31b6c608419e4b8e1653a800cfb600bdc7 /scp2 | |
| parent | ffae67cba85e9737927d03b525f3108df9b4c526 (diff) | |
scp2: move ICU to AutoInstall
Change-Id: Ia9beb721301146fd8ec1d6c141189f580dd20d45
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 43 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
2 files changed, 0 insertions, 46 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6703125ff6d1..cc45c1279738 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -110,49 +110,6 @@ End #endif #endif -#ifndef SYSTEM_ICU - -File gid_File_Lib_Icudata - PACKED_LIB_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR)); - #else - #ifdef MSVC_PKG_DEBUG_RUNTIME - Name = STRING(CONCAT3(icudtd,ICU_MAJOR,.dll)); - #else - Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll)); - #endif // MSVC_PKG_DEBUG_RUNTIME - #endif -End - -File gid_File_Lib_Icui18n - PACKED_LIB_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR)); - #else - #ifdef MSVC_PKG_DEBUG_RUNTIME - Name = STRING(CONCAT3(icuind,ICU_MAJOR,.dll)); - #else - Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll)); - #endif // MSVC_PKG_DEBUG_RUNTIME - #endif -End - -File gid_File_Lib_Icuuc - PACKED_LIB_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR)); - #else - #ifdef MSVC_PKG_DEBUG_RUNTIME - Name = STRING(CONCAT3(icuucd,ICU_MAJOR,.dll)); - #else - Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll)); - #endif // MSVC_PKG_DEBUG_RUNTIME - #endif -End - -#endif - #if defined(MACOSX) File gid_File_Lib_Basebmp Name = LIBNAME(basebmp); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 40a6e8d144b4..fad9607af00a 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -156,9 +156,6 @@ Module gid_Module_Root_Files_5 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_Unixlink_File_Lib_Curl, - gid_File_Lib_Icudata, - gid_File_Lib_Icui18n, - gid_File_Lib_Icuuc, gid_File_Lib_Recentfile, gid_File_Lib_Tab, gid_File_Lib_Tab2, |