summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-02-08 16:31:44 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-02-08 16:32:49 +0100
commit5319808d29666827df2b6010b433c293cf738b4e (patch)
tree72741726f0aa2c267803d135f32e4bdf2de3f14b /scp2
parenta75aeb5cefd338d44dd36a8892e63c1095c71273 (diff)
Package the right pixman and cairo
Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ef16c9450131..f6699e650ac6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -560,7 +560,7 @@ File gid_File_Lib_Cairo
#ifdef MACOSX
Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
#else
- Name = STRING(CONCAT2(libcairo,UNXSUFFIX));
+ Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
#endif
#elif defined(WNT)
#ifdef _gcc3
@@ -578,7 +578,11 @@ File gid_File_Lib_Pixman
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
+ #ifdef MACOSX
Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+ #endif
#endif
End