[Libreoffice-commits] core.git: scp2/source

Marcos Paulo de Souza marcos.souza.org at gmail.com
Mon Nov 18 14:18:52 PST 2013


 scp2/source/ooo/file_library_ooo.scp |   18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 6d9026f7a7ebad02b57fcd2dd15f66adeba361af
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date:   Mon Nov 18 19:03:21 2013 -0200

    Use filelist in curl
    
    Change-Id: I6a5fa0f7c0c9184ff013e2630f8edcb6ba2aa942
    Reviewed-on: https://gerrit.libreoffice.org/6713
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index d8245c9..c01b777 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -86,21 +86,9 @@ End
 
 File gid_File_Lib_Curl
     LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
-    #endif
-  #else
-   #ifdef _gcc3
-    Name = "libcurl-4.dll";
-   #else
-    Name = "libcurl.dll";
-   #endif
-  #endif
+    Styles = (FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "curl.filelist";
 End
 
 #endif


More information about the Libreoffice-commits mailing list