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

[Kohei Yoshida]

 desktop/Library_sofficeapp.mk |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit f10086d664f0890c79323f6a76181c7196259a37
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Dec 4 12:15:11 2014 -0500

    init.cxx is for now ANDROID and LINUX (unix?) only.
    
    It doesn't build on Windows. Let's exclude it.
    
    Change-Id: I153343e49318ee2ac63f95bbe6a2feeb26a96cff

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 80479b4..60daade 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -118,15 +118,18 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\
 endif
 
 # liblibreoffice bits
+ifeq ($(OS),ANDROID)
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 	desktop/source/lib/init \
+	desktop/source/lib/lokandroid \
 ))
-
-ifeq ($(OS),ANDROID)
+else
+ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
-	desktop/source/lib/lokandroid \
+	desktop/source/lib/init \
 ))
 endif
+endif
 
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 $(eval $(call gb_Library_use_libraries,sofficeapp,tubes))