diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-03-09 09:48:35 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-03-09 09:49:37 +0100 |
| commit | 88b848092c6c073be93b4e9f7f14d1246ae94ac7 (patch) | |
| tree | 479ccbe8d66173366fdf438bf35e0672c5540ec5 /scp2 | |
| parent | 401a834e0bb5b9a1fdf4d8648cb7c630ce452459 (diff) | |
Package lcms2 if internal one is used
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 23 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 4 |
2 files changed, 27 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 716f5903d512..572a9d602e28 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -572,6 +572,29 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) +#ifndef SYSTEM_LCMS2 + +File gid_File_Lib_Lcms2 + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + #ifdef MACOSX + Name = STRING(CONCAT3(liblcms2,.2,UNXSUFFIX)); + #else + Name = STRING(CONCAT3(liblcms2,UNXSUFFIX,.2)); + #endif + #elif defined(WNT) + #ifdef _gcc3 + Name = "liblcms2-2.dll"; + #else + Name = "lcms2.dll"; + #endif + #endif +End + +#endif + #ifndef LIBO_HEADLESS #ifndef SYSTEM_CAIRO diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index a6ace0dcc41c..8e4d7eeae14f 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -121,6 +121,10 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpng, libpng15-15.dll ) MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcairo, libcairo-2.dll ) #endif +#ifdef SYSTEM_LCMS2 +MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblcms2, liblcms2-2.dll ) +#endif + #if defined(MINGW_GCCDLL) File gid_Brand_File_Lib_Mingw_GccS |