[Libreoffice-commits] .: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/gbuild_simple.mk |   32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

New commits:
commit 72d6f61ef3a48d25ca2bcc6d0372f38d8697323a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jul 30 22:12:56 2011 +0300

    Include the iOS or Android platform files when appropriate

diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index 38d545a..0d056da 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -37,40 +37,30 @@ include $(GBUILDDIR)/Helper.mk
 
 ifeq ($(OS),LINUX)
 include $(GBUILDDIR)/platform/linux.mk
-else
-ifeq ($(OS),WNT)
+else ifeq ($(OS),WNT)
 ifneq ($(USE_MINGW),)
 include $(GBUILDDIR)/platform/winmingw.mk
 else
 include $(GBUILDDIR)/platform/windows.mk
 endif
-else
-ifeq ($(OS),SOLARIS)
+else ifeq ($(OS),SOLARIS)
 include $(GBUILDDIR)/platform/solaris.mk
-else
-ifeq ($(OS),MACOSX)
+else ifeq ($(OS),MACOSX)
 include $(GBUILDDIR)/platform/macosx.mk
-else
-ifeq ($(OS),OPENBSD)
+else ifeq ($(OS),OPENBSD)
 include $(GBUILDDIR)/platform/openbsd.mk
-else
-ifeq ($(OS),FREEBSD)
+else ifeq ($(OS),FREEBSD)
 include $(GBUILDDIR)/platform/freebsd.mk
-else
-ifeq ($(OS),NETBSD)
+else ifeq ($(OS),NETBSD)
 include $(GBUILDDIR)/platform/netbsd.mk
-else
-ifeq ($(OS),DRAGONFLY)
+else ifeq ($(OS),DRAGONFLY)
 include $(GBUILDDIR)/platform/dragonfly.mk
+else ifeq ($(OS),IOS)
+include $(GBUILDDIR)/platform/ios.mk
+else ifeq ($(OS),ANDROID)
+include $(GBUILDDIR)/platform/android.mk
 else
 $(eval $(call gb_Output_error,Unsupported OS: $(OS)))
 endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
 
 # vim: set noet sw=4 ts=4: