From 585d9806961342e95f7318fb947bd31e9f86dee0 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Fri, 22 Dec 2017 20:46:12 +0300 Subject: tdf#114635: Add TWAINDSM.DLL to 64-bit Windows package This patch allows us to use our own bundled TWAINDSM.dll (from twain-dsm project, http://www.twain.org, https://github.com/twain/twain-dsm) on 64-bit Windows systems that don't have their own TWAIN DLL, and without requiring users to install it from some other source. The DLL is put into INSTALLOCATION/program along soffice.bin. Of course, TWAIN sources still need to be 64-bit themselves (i.e., true 64-bit TWAIN drivers required) to be usable by 64-bit program. Also this drops external/twain/inc/twain/twain.h, which is an old version copied from twain-dsm, and instead uses the tarball to get the header (required by Library_scn on both 32- and 64-bit Windows). Change-Id: I191027f3221ce46db17f50db91c9cb9315900810 Reviewed-on: https://gerrit.libreoffice.org/46992 Reviewed-by: Michael Stahl Tested-by: Jenkins --- Repository.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index f209195ed88d..6ba9571c67d3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -957,6 +957,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ )) \ sfx2_classification \ $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \ + $(if $(and $(filter WNT,$(OS)), $(filter X86_64,$(CPUNAME))),twain_dsm) \ )) $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ -- cgit v1.2.3