diff options
| -rw-r--r-- | RepositoryExternal.mk | 16 | ||||
| -rw-r--r-- | fontconfig/makefile.mk | 4 | ||||
| -rw-r--r-- | fontconfig/prj/d.lst | 2 | ||||
| -rw-r--r-- | freetype/makefile.mk | 2 | ||||
| -rw-r--r-- | freetype/prj/d.lst | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 |
6 files changed, 23 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 26de78162f7a..b695b115b3c2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -183,6 +183,12 @@ $(call gb_LinkTarget__use_expat,$(1),expat_xmlparse) endef +ifeq ($(OS),ANDROID) +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + fontconfig \ + freetype \ +)) +endif ifeq ($(SYSTEM_HUNSPELL),YES) @@ -478,7 +484,12 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(FREETYPE_CFLAGS) \ ) + +ifneq ($(OS),ANDROID) $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) +else +$(call gb_LinkTarget_use_static_libraries,$(1),freetype) +endif endef @@ -487,7 +498,12 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(FONTCONFIG_CFLAGS) \ ) + +ifneq ($(OS),ANDROID) $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS)) +else +$(call gb_LinkTarget_use_static_libraries,$(1),fontconfig) +endif endef 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 diff --git a/freetype/makefile.mk b/freetype/makefile.mk index 0f9be873f939..52f73663e952 100644 --- a/freetype/makefile.mk +++ b/freetype/makefile.mk @@ -44,7 +44,7 @@ PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_ACTION=./configure CONFIGURE_FLAGS=\ - --disable-static \ + --disable-shared \ --without-zlib \ --without-bzip2 \ --prefix=$(SOLARVER)/$(INPATH) --includedir=$(SOLARVER)/$(INPATH)/inc/external \ diff --git a/freetype/prj/d.lst b/freetype/prj/d.lst index 428e6a0a75f6..ac34ac49efb3 100644 --- a/freetype/prj/d.lst +++ b/freetype/prj/d.lst @@ -1,4 +1,4 @@ -..\%__SRC%\misc\build\freetype*\objs\.libs\*.so %_DEST%\lib +..\%__SRC%\misc\build\freetype*\objs\.libs\*.a %_DEST%\lib ..\%__SRC%\misc\build\freetype*\builds\unix\freetype-config %_DEST%\bin diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d85bd9920de4..0898286c7cae 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -501,6 +501,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(eval $(call gb_Library_use_externals,vcl,\ fontconfig \ freetype \ + expat_utf8 \ )) endif |