Kaydet (Commit) 12ee1efb authored tarafından Peter Foley's avatar Peter Foley

fix icu build

Change-Id: Iacb4deeb29d20d8369e09d55c0b0d36324a48ce8
üst ffe1a2a9
......@@ -61,23 +61,22 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\
source/lib/libicutulo.so \
))
else
$(eval $(call gb_ExternalPackage_add_files,icu,lib,\
source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \
source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR) \
source/lib/libicudata$(gb_Library_DLLEXT) \
source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \
source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR) \
source/lib/libicuuc$(gb_Library_DLLEXT) \
source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \
source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR) \
source/lib/libicui18n$(gb_Library_DLLEXT) \
source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \
source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR) \
source/lib/libicule$(gb_Library_DLLEXT) \
source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \
source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR) \
source/lib/libicutu$(gb_Library_DLLEXT) \
))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO)))
$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
source/bin/genccode \
source/bin/genbrk \
......
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