diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-04 12:15:11 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-04 12:20:05 -0500 |
commit | f10086d664f0890c79323f6a76181c7196259a37 (patch) | |
tree | 509802c2df928a1b4332c043cdc530202b92a0e4 /desktop | |
parent | cid#1256668: uninit ptr field (diff) | |
download | core-f10086d664f0890c79323f6a76181c7196259a37.tar.gz core-f10086d664f0890c79323f6a76181c7196259a37.zip |
init.cxx is for now ANDROID and LINUX (unix?) only.
It doesn't build on Windows. Let's exclude it.
Change-Id: I153343e49318ee2ac63f95bbe6a2feeb26a96cff
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/Library_sofficeapp.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 80479b4af6d2..60daadefcd76 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)) |