summaryrefslogtreecommitdiffstats
path: root/solenv/inc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-04 23:45:35 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-04 23:45:35 +0300
commitd9919783b2a2a82d8f6015d4220f8e2cfe841906 (patch)
treebdf3f6c50eca1cd2655a6df15ae0da49532f95fc /solenv/inc
parentMap also static LINKED_LIBS into -l option syntax (diff)
downloadcore-d9919783b2a2a82d8f6015d4220f8e2cfe841906.tar.gz
core-d9919783b2a2a82d8f6015d4220f8e2cfe841906.zip
libcurl gets built as a static library on Android
Diffstat (limited to 'solenv/inc')
-rw-r--r--solenv/inc/libs.mk11
1 files changed, 11 insertions, 0 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 13c9c7415a9d..15d9677fcd21 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