diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 22:47:23 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-06 13:05:42 +0200 |
| commit | 9b50c4f63c2ecb95245511940dacb3e91027499f (patch) | |
| tree | 12e8c2e3a2187e5d2667af8b1c1b4765b7f145be /Repository.mk | |
| parent | 2a39dc74724d3648ff76aa900edfebe0dd19b296 (diff) | |
scp2: package 64-bit MSVC runtimes for explorer extensions
... and add BUILD_X64 conditional.
Change-Id: Id512368dfd9dece583ead5aae1924db96f8a2a40
Reviewed-on: https://gerrit.libreoffice.org/38366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index bd1ad2c80e7a..2c2d22e443f6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -687,11 +687,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexp shlxthdl \ )) +ifneq ($(BUILD_X64),) +$(eval $(call gb_Helper_register_packages_for_install,winexplorerextwin64, \ + $(if $(filter MSC,$(COM)),msvc_dlls) \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \ ooofilt_x64 \ propertyhdl_x64 \ shlxthdl_x64 \ )) +endif # BUILD_X64 endif # WNT @@ -793,7 +799,6 @@ $(eval $(call gb_Helper_register_packages, \ test_unittest \ cli_basetypes_copy \ extras_wordbook \ - $(if $(filter MSC,$(COM)),msvc_dlls) \ instsetoo_native_setup \ $(if $(ENABLE_OOENV),instsetoo_native_ooenv) \ postprocess_registry \ |