diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 15:00:29 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-23 19:21:14 +0200 |
commit | a92f80fdca36976ecfaed84eaf29b14f5503603a (patch) | |
tree | 5f51f302770b0e2e93d7adfa36e9773ebf9dab88 /external/icu | |
parent | Makefile: make convenience targets like "make icu" work for external/ (diff) | |
download | core-a92f80fdca36976ecfaed84eaf29b14f5503603a.tar.gz core-a92f80fdca36976ecfaed84eaf29b14f5503603a.zip |
icu: use libraries from WORKDIR
Change-Id: I7d996cc9412eadf89c8d04ee29abe1fa6f7d53db
Diffstat (limited to 'external/icu')
-rw-r--r-- | external/icu/ExternalPackage_icu.mk | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index 4af02f5a96fe..baf38c77aa25 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -12,13 +12,11 @@ icu_VERSION := $(ICU_MAJOR).$(ICU_MINOR)$(if $(ICU_MICRO),.$(ICU_MICRO)) $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) $(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata.dll.a,source/stubdata/icudt.lib)) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc.dll.a,source/lib/icuuc.lib)) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n.dll.a,source/lib/icuin.lib)) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu.dll.a,source/lib/icutu.lib)) +ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(ICU_MAJOR).dll \ source/lib/icuuc$(ICU_MAJOR).dll \ @@ -30,14 +28,7 @@ $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genbrk.exe \ source/bin/gencmn.exe \ )) - else -$(eval $(call gb_ExternalPackage_add_files,icu,lib,\ - source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ - source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ - source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ - source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib\ -)) $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ @@ -49,37 +40,31 @@ $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genbrk.exe \ source/bin/gencmn.exe \ )) -endif -else # $(OS) -ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_files,icu,lib,\ - source/lib/libicudata.a \ - source/lib/libicuuc.a \ - source/lib/libicui18n.a \ - source/lib/libicutu.a \ -)) +endif # $(COM) + else ifeq ($(OS),ANDROID) + $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\ source/lib/libicudatalo.so \ source/lib/libicuuclo.so \ source/lib/libicui18nlo.so \ source/lib/libicutulo.so \ )) -else + +else # $(OS) != WNT/ANDROID + $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genccode \ source/bin/genbrk \ source/bin/gencmn \ )) -endif -endif + +endif # $(OS) +endif # DISABLE_DYNLOADING + # vim: set noet sw=4 ts=4: |