[Libreoffice-commits] .: scp2/source

[Tor Lillqvist]

 scp2/source/ooo/file_library_ooo.scp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 085b0f1259bdce9c4f8d87e0ff84d56c9e5ba65e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 1 11:18:00 2011 +0300

    We build a static libpixman on Windows, it seems

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 905bbaa..fee49c3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -593,6 +593,8 @@ File gid_File_Lib_Cairo
   #endif
 End
 
+#ifndef WNT
+
 File gid_File_Lib_Pixman
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -603,13 +605,13 @@ File gid_File_Lib_Pixman
     #else
        Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
     #endif
-  #elif defined(WNT)
-    Name = "libpixman-1-0.dll";
   #endif
 End
 
 #endif
 
+#endif
+
 STD_LIB_FILE( gid_File_Lib_Frm , frm)
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )