mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to fix libcdr build

Browse Source 
Change-Id: Ifcadb0e7be11d32e370b578e21f5d8881bab640f
This commit is contained in:
Fridrich Štrba 2013-01-25 10:55:04 +01:00
parent 851ca9c0c2
commit 8e9675d233
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RepositoryExternal.mk
View File

@ -909,7 +909,7 @@ endif # SYSTEM_GRAPHITE
ifeq ($(SYSTEM_ICU),YES)
gb_LinkTarget__use_icu_headers:=
gb_ExternalProject__use_icu_headers:=
gb_ExternalProject__use_icu:=
define gb_LinkTarget__use_icudata
$(call gb_LinkTarget_add_libs,$(1),-licudata)
@ -951,14 +951,8 @@ $(call gb_LinkTarget_set_include,$(1),\
endef
define gb_ExternalProject__use_icu_headers
$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,icu)
$(call gb_ExternalProject_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/common \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
$$(INCLUDE) \
)
define gb_ExternalProject__use_icu
$(call gb_ExternalProject_use_package,$(1),icu)
endef

2
libcdr/ExternalProject_libcdr.mk
View File

@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\
))
$(eval $(call gb_ExternalProject_use_externals,libcdr,\
icu_headers \
icu \
lcms2 \
wpd \
wpg \