summaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-04-19 21:10:00 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-04-20 00:57:24 +0300
commit0d1c24e5f63fb31538d708e9842cec121e3e3f98 (patch)
tree842733b46fefb6f2c94354f89563930f97f754e2 /fontconfig
parentd83e45ae9c97c0722bf63228a62361a8d1d75595 (diff)
Build freetype and fontconfig statically for Android
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/makefile.mk4
-rw-r--r--fontconfig/prj/d.lst2
2 files changed, 4 insertions, 2 deletions
diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
index a866c4c85a43..55375c6758be 100644
--- a/fontconfig/makefile.mk
+++ b/fontconfig/makefile.mk
@@ -47,8 +47,10 @@ CONFIGURE_ACTION=./configure
CONFIGURE_ACTION!:=CFLAGS=-g $(CONFIGURE_ACTION)
.ENDIF
+# This "bundled" fontconfig is built only when cross-compiling for Android
+
CONFIGURE_FLAGS=\
- --disable-static \
+ --disable-shared \
--with-arch=arm \
--with-expat-includes=$(SOLARVER)/$(INPATH)/inc/external \
--with-expat-lib=$(SOLARVER)/$(INPATH)/lib \
diff --git a/fontconfig/prj/d.lst b/fontconfig/prj/d.lst
index 1e2a4e17fdbb..aeb7edf32a7e 100644
--- a/fontconfig/prj/d.lst
+++ b/fontconfig/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\misc\build\fontconfig*\src\.libs\*.so %_DEST%\lib
+..\%__SRC%\misc\build\fontconfig*\src\.libs\*.a %_DEST%\lib
mkdir: %_DEST%\inc\external\fontconfig
..\%__SRC%\misc\build\fontconfig*\fontconfig\*.h %_DEST%\inc\external\fontconfig