[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/libs.mk |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 6e6567caad64ec2626f15bd6eec70d67f84bef5f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 4 23:45:35 2011 +0300

    libcurl gets built as a static library on Android

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 13c9c74..15d9677 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -328,6 +328,17 @@ VCLLIB+=$(ICUUCLIB)
 
 .ENDIF
 
+.IF "$(OS)" == "ANDROID"
+
+# Some of the external libraries get built as static libraries for
+# Android, mostly by accident, because we haven't bothered fixing up
+# their configury to realize that it would work to build shared
+# libraries.
+
+CURLLIB+=$(ZLIB3RDLIB)
+
+.ENDIF
+
 .ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
 ODMA_LIB_LIB=odma_lib.lib