diff options
Diffstat (limited to 'external/msc-externals')
| -rw-r--r-- | external/msc-externals/Makefile | 7 | ||||
| -rw-r--r-- | external/msc-externals/Module_msc-externals.mk | 29 | ||||
| -rw-r--r-- | external/msc-externals/Package_msvc_dlls.mk | 16 | ||||
| -rw-r--r-- | external/msc-externals/Package_ucrt.mk | 21 | ||||
| -rw-r--r-- | external/msc-externals/README | 1 |
5 files changed, 74 insertions, 0 deletions
diff --git a/external/msc-externals/Makefile b/external/msc-externals/Makefile new file mode 100644 index 0000000000..e4968cf85f --- /dev/null +++ b/external/msc-externals/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk new file mode 100644 index 0000000000..07ea3878a1 --- /dev/null +++ b/external/msc-externals/Module_msc-externals.mk @@ -0,0 +1,29 @@ +# -*- 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/. +# + +$(eval $(call gb_Module_Module,msc-externals)) + +ifneq ($(BUILD_X64),) + +$(eval $(call gb_Module_add_targets,msc-externals,\ + Package_msvc_dlls \ +)) + +endif + +# Install the universal crts (tdf#108580) +ifneq ($(UCRT_REDISTDIR),) + +$(eval $(call gb_Module_add_targets,msc-externals,\ + Package_ucrt \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/msc-externals/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk new file mode 100644 index 0000000000..d82dd06c3c --- /dev/null +++ b/external/msc-externals/Package_msvc_dlls.mk @@ -0,0 +1,16 @@ +# -*- 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/. +# + +$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH))) + +$(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\ + $(MSVC_DLLS) \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/msc-externals/Package_ucrt.mk b/external/msc-externals/Package_ucrt.mk new file mode 100644 index 0000000000..52e6f0cbae --- /dev/null +++ b/external/msc-externals/Package_ucrt.mk @@ -0,0 +1,21 @@ +# -*- 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/. +# + +$(eval $(call gb_Package_Package,ucrt,$(UCRT_REDISTDIR))) + +$(eval $(call gb_Package_add_files,ucrt,$(LIBO_ETC_FOLDER),\ + Windows6.1-KB2999226-x64.msu \ + Windows6.1-KB2999226-x86.msu \ + Windows8.1-KB2999226-x64.msu \ + Windows8.1-KB2999226-x86.msu \ + Windows8-RT-KB2999226-x64.msu \ + Windows8-RT-KB2999226-x86.msu \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/msc-externals/README b/external/msc-externals/README new file mode 100644 index 0000000000..9ffb415c36 --- /dev/null +++ b/external/msc-externals/README @@ -0,0 +1 @@ +module msc-externals copies the bundled MSVC runtime DLLs into instdir |