[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeiOS.conf soltools/adjustvisibility soltools/checkdll soltools/giparser soltools/javadep soltools/support

[Tor Lillqvist]

 distro-configs/LibreOfficeiOS.conf    |    2 ++
 soltools/adjustvisibility/makefile.mk |    1 +
 soltools/checkdll/makefile.mk         |    2 +-
 soltools/giparser/makefile.mk         |    1 +
 soltools/javadep/makefile.mk          |    1 +
 soltools/support/makefile.mk          |    1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 698d615fc28c947dab57c1fba92c4630542539a9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat May 14 01:52:12 2011 +0300

    Cross-compilation support and iOS in particular

diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index ea0d09c..65a94c9 100644
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..
 PRJNAME=soltools
 TARGET=adjustvisibility
 TARGETTYPE=CUI
+TARGETPLATFORM=BUILD
 ENABLE_EXCEPTIONS=TRUE
 noadjust=TRUE
 
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index 865d5a8..51e7d59 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -40,7 +40,7 @@ NO_DEFAULT_STL=TRUE
 # --- Files --------------------------------------------------------
 
 
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" && "$(OS)"!="IOS"
 LIBSALCPPRT=$(0)
 APP1TARGET	= 	checkdll
 APP1OBJS	=	$(OBJ)$/checkdll.obj
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index a463f5a..436fadf 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..
 PRJNAME=soltools
 TARGET=soltools_giparser
 TARGETTYPE=CUI
+TARGETPLATFORM=BUILD
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index 1b3b54d..4e43c5c 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..
 PRJNAME=soltools
 TARGET=javadep
 TARGETTYPE=CUI
+TARGETPLATFORM=BUILD
 NO_DEFAULT_STL=TRUE
 
 # --- Settings -----------------------------------------------------
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index d3f1095..2db04de 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..
 PRJNAME=soltools
 TARGET=soltools_support
 TARGETTYPE=CUI
+TARGETPLATFORM=BUILD
 
 # --- Settings -----------------------------------------------------
 
commit 6d0891e84c83dc41861dfa09304a8b27773df71f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat May 14 01:51:04 2011 +0300

    Do even less

diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 16e8e6f..0ce6cd7 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -16,6 +16,8 @@
 --disable-randr
 --disable-randr-link
 --disable-systray
+--without-fonts
 --without-java
 --without-junit
+--without-ppds
 --without-system-python