[Libreoffice-commits] core.git: include/LibreOfficeKit

Tor Lillqvist tml at collabora.com
Mon Mar 9 05:00:17 PDT 2015


 include/LibreOfficeKit/LibreOfficeKitInit.h |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ca3a68c728a6312795b14885aa829396b9275bc8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 9 13:55:14 2015 +0200

    Look for .dylib on OS X, but ...
    
    ... note that the LibreOfficeKit bits aren't built for OS X. I don't
    recall if there is some fundamental reason why not. Was it so that for
    OS X, like for iOS, a "virtual device" should be created with a
    CGContext and not a pixmap buffer?
    
    Change-Id: I6e1fedb89e7fe409baf2ea1ac7f3b65b0f1c776b

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index a6599fd..18731b7 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -28,8 +28,13 @@ extern "C"
     #ifdef  _AIX
     #  include <sys/ldr.h>
     #endif
-    #define TARGET_LIB        "lib" "sofficeapp" ".so"
-    #define TARGET_MERGED_LIB "lib" "mergedlo" ".so"
+    #ifdef __APPLE__
+        #define TARGET_LIB        "lib" "sofficeapp" ".dylib"
+        #define TARGET_MERGED_LIB "lib" "mergedlo" ".dylib"
+    #else
+        #define TARGET_LIB        "lib" "sofficeapp" ".so"
+        #define TARGET_MERGED_LIB "lib" "mergedlo" ".so"
+    #endif
     #define SEPERATOR         '/'
 
     void *_dlopen(const char *pFN)


More information about the Libreoffice-commits mailing list