Skip to content

C
core
Kaydet (Commit) e568d2ad authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

fontconfig: don't use gb_ExternalProject_use_packages directly 

Change-Id: I4ebe1a8caded065043db997e34d5d2b205fcca20
üst 623f89b3
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
RepositoryExternal.mk
Dosyayı görüntüle @ e568d2ad
...@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) ...@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
endef endef
gb_ExternalProject__use_freetype :=
else ifeq ($(OS),ANDROID) else ifeq ($(OS),ANDROID)
define gb_LinkTarget__use_freetype_headers define gb_LinkTarget__use_freetype_headers
...@@ -1056,6 +1058,11 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers) ...@@ -1056,6 +1058,11 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers)
endef endef
define gb_ExternalProject__use_freetype
$(call gb_ExternalProject_use_package,$(1),freetype)
endef
endif # SYSTEM_FREETYPE endif # SYSTEM_FREETYPE
ifeq ($(SYSTEM_FONTCONFIG),YES) ifeq ($(SYSTEM_FONTCONFIG),YES)
......
fontconfig/ExternalProject_fontconfig.mk
Dosyayı görüntüle @ e568d2ad
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalProject_ExternalProject,fontconfig)) $(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
$(eval $(call gb_ExternalProject_use_packages,fontconfig,\ $(eval $(call gb_ExternalProject_use_externals,fontconfig,\
expat \ expat \
freetype \ freetype \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment