diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/ExternalPackage_icu.mk | 4 | ||||
| -rw-r--r-- | external/icu/ExternalPackage_icu_ure.mk | 33 | ||||
| -rw-r--r-- | external/icu/Module_icu.mk | 1 |
3 files changed, 34 insertions, 4 deletions
diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index be3a1d80491a..4c90d8f51a35 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -18,14 +18,10 @@ ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\ - source/lib/icudt$(ICU_MAJOR).dll \ - source/lib/icuuc$(ICU_MAJOR).dll \ source/lib/icuin$(ICU_MAJOR).dll \ )) else $(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\ - source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ - source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ )) endif # $(COM) diff --git a/external/icu/ExternalPackage_icu_ure.mk b/external/icu/ExternalPackage_icu_ure.mk new file mode 100644 index 000000000000..a016c8c0e27d --- /dev/null +++ b/external/icu/ExternalPackage_icu_ure.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# libxml2 is in URE and depends on icuuc*.dll on Windows - extra package needed +$(eval $(call gb_ExternalPackage_ExternalPackage,icu_ure,icu)) + +$(eval $(call gb_ExternalPackage_use_external_project,icu_ure,icu)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq ($(OS),WNT) + +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\ + source/lib/icudt$(ICU_MAJOR).dll \ + source/lib/icuuc$(ICU_MAJOR).dll \ +)) +else +$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\ + source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ + source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ +)) +endif # $(COM) + +endif # $(OS) +endif # DISABLE_DYNLOADING + +# vim: set noet sw=4 ts=4: diff --git a/external/icu/Module_icu.mk b/external/icu/Module_icu.mk index 258c26ea4e61..5c99b930fc89 100644 --- a/external/icu/Module_icu.mk +++ b/external/icu/Module_icu.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,icu)) $(eval $(call gb_Module_add_targets,icu,\ UnpackedTarball_icu \ ExternalPackage_icu \ + ExternalPackage_icu_ure \ ExternalProject_icu \ )) |