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 /scp2/AutoInstall.mk | |
| parent | tdf#108259 Fix nested checkbox handling in autofilter popup (diff) | |
| download | core-9b50c4f63c2ecb95245511940dacb3e91027499f.tar.gz core-9b50c4f63c2ecb95245511940dacb3e91027499f.zip | |
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 'scp2/AutoInstall.mk')
| -rw-r--r-- | scp2/AutoInstall.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 00068404da22..3c15f888584b 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -32,7 +32,7 @@ $(eval $(call gb_AutoInstall_add_module,libreofficekit,LIBO_LIB_FILE,LIBO_EXECUT $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE,,,PACKAGE_FILELIST)) -$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST,"ISCHECKFORPRODUCTUPDATES=1")) +$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST_COMPONENTCONDITION,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,ooo_fonts,,,,PACKAGE_FILELIST_FONT)) $(eval $(call gb_AutoInstall_add_module,ooo_images,,,,PACKAGE_FILELIST)) @@ -50,7 +50,7 @@ $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_J $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE)) ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,,"VersionNT64")) +$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,PACKAGE_FILELIST_COMPONENTCONDITION,"VersionNT64")) endif $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) |