summaryrefslogtreecommitdiff
path: root/lcms2
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-06-06 22:57:56 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-06-07 21:54:17 +0300
commitbd4d371178f863d09098c3549dc73713423dc560 (patch)
tree9717ca8e21bbdceb786dd78a50522144e9261589 /lcms2
parent96caa3b7aea151744c5fa9ba4a4a940817e12531 (diff)
Build lcms2 statically for Android, too.
A quick way to avoid the problem with its name ending with ".so.2" which the Android app machinery doesn't like. Plus, one less shared library... Change-Id: I102e29dd13d1be1a134be8c09459259fe8fbe2e1
Diffstat (limited to 'lcms2')
-rw-r--r--lcms2/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 6f619bfaff4e..b6b571f4b29c 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -77,7 +77,7 @@ CONFIGURE_FLAGS += \
--prefix=/@.__________________________________________________$(EXTRPATH)
.END
-.IF "$(OS)" == "IOS"
+.IF "$(OS)" == "IOS" || "$(OS)" == "ANDROID"
CONFIGURE_ACTION += --disable-shared
.ENDIF
@@ -89,7 +89,7 @@ OUT2INC+=include$/lcms2*.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/liblcms2.*.dylib
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)" == "ANDROID"
OUT2LIB+=src$/.libs$/liblcms2.a
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"