[Libreoffice-commits] core.git: 2 commits - desktop/Library_sofficeapp.mk desktop/source

[Tor Lillqvist]

 desktop/Library_sofficeapp.mk |    2 +-
 desktop/source/lib/init.cxx   |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a1aa2cdaa7c467376c1f7824e2b6a83cb252a39a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat May 23 10:09:18 2015 +0100

    Look for libsofficeapp.dylib in the right place on OS X
    
    Change-Id: Icef6b70081b15d4b8d99eb4ba7103f059e8d00e4

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 00d0976..3ca2744 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -845,6 +845,8 @@ static bool initialize_uno(const OUString& aAppProgramURL)
 #ifdef IOS
     // For iOS we already hardocde the inifile as "rc" in the .app directory.
     (void) aAppProgramURL;
+#elif defined MACOSX
+    rtl::Bootstrap::setIniFilename(aAppProgramURL + "/../Resources/" SAL_CONFIGFILE("soffice"));
 #else
     rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" SAL_CONFIGFILE("soffice"));
 #endif
commit 5814148eaebc5e443722376480b8c56e15597a0e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat May 23 10:08:55 2015 +0100

    Build the LibreOfficeKit bits for OS X, too
    
    Change-Id: I43013ffc27ba21f65fd1372533dd665894e5c008

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 91c7a51..d3ca8d0 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -110,7 +110,7 @@ endif
 endif
 
 # LibreOfficeKit bits
-ifneq ($(filter $(OS),ANDROID IOS),)
+ifneq ($(filter $(OS),ANDROID IOS MACOSX),)
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 	desktop/source/lib/init \
 	$(if $(filter $(OS),ANDROID), \