Kaydet (Commit) 9a943e58 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Fix linking with harfbuzz

Change-Id: Ic28c7922b0fab3b5a7ac1c0500a429539a4c29bc
üst b760eff8
......@@ -1186,7 +1186,7 @@ endef
endif # SYSTEM_ICU
ifeq ($(ENABLE_HARFBUZZ),YES)
ifeq ($(ENABLE_HARFBUZZ),TRUE)
ifeq ($(SYSTEM_HARFBUZZ),YES)
define gb_LinkTarget__use_harfbuzz
......
......@@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
&& ./configure \
--enable-static \
--disable-shared \
--with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) libharfbuzz.la) \
)
......
......@@ -110,6 +110,12 @@ $(eval $(call gb_Library_use_externals,vcl,\
))
endif
ifeq ($(ENABLE_HARFBUZZ),TRUE)
$(eval $(call gb_Library_use_externals,vcl,\
harfbuzz \
))
endif
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/app/brand \
vcl/source/app/dbggui \
......@@ -347,7 +353,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
endif
$(eval $(call gb_Library_use_external,vcl,graphite))
$(eval $(call gb_Library_use_external,vcl,harfbuzz))
endif
......
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