diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-28 12:40:37 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-28 16:47:49 +0200 |
commit | f0149fe6eaa5e8ac121af39354950c73534482a3 (patch) | |
tree | 5a077e50ab6344580d0d26e908e5d968c9c701af /desktop | |
parent | Make deprecation warnings non-fatal even in a -Werror compilation (diff) | |
download | core-f0149fe6eaa5e8ac121af39354950c73534482a3.tar.gz core-f0149fe6eaa5e8ac121af39354950c73534482a3.zip |
Android now builds up to instsetoo_native
Last fixes - remove kludge from RepositoryFixes.mk, have redland
build w/o threads for the while, and some hackery to exclude
pointless code like oosplash from android build.
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/Module_desktop.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 84df7dd864bd..2b137f68504f 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -92,14 +92,16 @@ $(eval $(call gb_Module_add_targets,desktop,\ WinResTarget_swriter \ )) -else - -ifeq ($(OS),MACOSX) +else ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,desktop,\ Executable_officeloader \ )) +else ifeq ($(OS),ANDROID) + +else ifeq ($(OS),IOS) + else $(eval $(call gb_Module_add_targets,desktop,\ @@ -109,6 +111,4 @@ $(eval $(call gb_Module_add_targets,desktop,\ endif -endif - # vim: set ts=4 sw=4 et: |