diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-12 22:38:26 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-12 22:38:26 +0000 |
commit | a8430dc185dbc6d3a3da987bd0f09925bf3edf3d (patch) | |
tree | 30efc2e68816dc9a93ebe16fd19d13582b4beb81 /scp2 | |
parent | 2011428e8d1c0fe0cbf318111ffab93616bc0292 (diff) |
CWS-TOOLING: integrate CWS mingwport17
2009-02-02 09:09:07 +0100 tono r267246 : i#98723#: Less conditionals in libs.mk for mingw
2009-02-02 09:06:03 +0100 tono r267244 : i#98722#: Skip building ldump in mingw
2009-02-02 09:04:05 +0100 tono r267243 : i#98721#: Improve symbol extraction in mingw
2009-02-02 09:02:07 +0100 tono r267242 : i#98720#: Improve strip performance in mingw
2009-02-02 08:59:36 +0100 tono r267241 : i#98719#: Copy mingw multithread runtime in external
2009-02-02 08:55:09 +0100 tono r267240 : i#98718#: Cleanup cygwin workaround for mingw
2009-02-02 08:53:33 +0100 tono r267239 : i#98718#: Cleanup cygwin workaround for mingw
2009-02-02 08:50:36 +0100 tono r267237 : i#98717#: Avoid MSVC version check in mingw configure
2009-01-28 22:28:53 +0100 tono r267088 : i#97608#: Remove Guiddef.h inclusion
2009-01-28 22:24:23 +0100 tono r267087 : i#96980#: cairo dll name is different in mingw build
2009-01-28 22:19:19 +0100 tono r267086 : i#96731#: MinGW port fro embedserv update
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 6 |
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 07a30418fb4c..91c48f7c34b1 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -602,7 +602,11 @@ File gid_File_Lib_Cairo Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2)); #endif #elif defined(WNT) - Name = "cairo.dll"; + #ifdef _gcc3 + Name = "libcairo-2.dll"; + #else + Name = "cairo.dll"; + #endif #endif End |