diff options
| author | Martin Hosken <martin_hosken@sil.org> | 2011-02-25 23:00:28 +0700 |
|---|---|---|
| committer | Martin Hosken <martin_hosken@sil.org> | 2011-03-10 22:36:32 +0700 |
| commit | e87464af6add6bfbe0b0c4d3780557b035411487 (patch) | |
| tree | 984ce3474bbe4a0efa97322e2ecfccb1069254f8 /scp2 | |
| parent | cd57e5bb1dfb066a169ded248315b26d933b3156 (diff) | |
graphite2 consolidated patch
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 15 | ||||
| -rw-r--r-- | scp2/source/ooo/shortcut_ooo.scp | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 54836a8b8d5c..47bce4adbbb1 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -808,6 +808,21 @@ End #endif +#ifndef SYSTEM_GRAPHITE + +File gid_File_Lib_Graphite + TXT_FILE_BODY; + #ifdef UNX + Name = STRING(CONCAT8(libgraphite2,UNXSUFFIX,.,2,.,0,.,0)); + #else + Name = graphite2.dll; + #endif + Dir = SCP2_OOO_BIN_DIR; + Styles = (PACKED); +End + +#endif + #ifdef SOLAR_JAVA STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 482a29a72c52..edaabeddcd5e 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -76,27 +76,28 @@ End #endif +#ifndef SYSTEM_GRAPHITE Shortcut gid_Shortcut_Lib_Graphite_0 FileID = gid_File_Lib_Graphite; Dir = gid_Dir_Program; - Name = STRING(CONCAT2(libgraphite,UNXSUFFIX)); + Name = STRING(CONCAT2(libgraphite2,UNXSUFFIX)); Styles = (NETWORK,RELATIVE); End Shortcut gid_Shortcut_Lib_Graphite_1 FileID = gid_File_Lib_Graphite; Dir = gid_Dir_Program; - Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3)); + Name = STRING(CONCAT4(libgraphite2,UNXSUFFIX,.,2)); Styles = (NETWORK,RELATIVE); End Shortcut gid_Shortcut_Lib_Graphite_2 FileID = gid_File_Lib_Graphite; Dir = gid_Dir_Program; - Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3.0)); + Name = STRING(CONCAT4(libgraphite2,UNXSUFFIX,.,2.0)); Styles = (NETWORK,RELATIVE); End - +#endif #endif #ifdef MACOSX |