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 /RepositoryExternal.mk | |
| parent | dddff6e51dd8dd755f9afabccda4ee91e1ecc78e (diff) | |
icu: use libraries from WORKDIR
Change-Id: I7d996cc9412eadf89c8d04ee29abe1fa6f7d53db
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 72 |
1 files changed, 43 insertions, 29 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 764f98845126..639d22ae763f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1192,60 +1192,74 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudt \ icuin \ )) - -define gb_LinkTarget__use_icudata -$(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icudt \ -) - -endef -define gb_LinkTarget__use_icui18n -$(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icuin \ -) - -endef else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudata$(gb_ICU_suffix) \ icui18n$(gb_ICU_suffix) \ )) +endif +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + icutu$(gb_ICU_suffix) \ + icuuc$(gb_ICU_suffix) \ +)) define gb_LinkTarget__use_icudata $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icudata$(gb_ICU_suffix) \ + +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licudata$(gb_ICU_suffix) \ ) +endif endef + define gb_LinkTarget__use_icui18n $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icui18n$(gb_ICU_suffix) \ -) -endef +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licui18n$(gb_ICU_suffix) \ +) endif -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icutu$(gb_ICU_suffix) \ - icuuc$(gb_ICU_suffix) \ -)) +endef define gb_LinkTarget__use_icutu $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icutu$(gb_ICU_suffix) \ + +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licutu$(gb_ICU_suffix) \ ) +endif endef + define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_use_package,$(1),icu) -$(call gb_LinkTarget_use_libraries,$(1),\ - icuuc$(gb_ICU_suffix) \ + +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licuuc$(gb_ICU_suffix) \ +) +endif endef |