path: root/
diff options
authorMike Kaganski <>2017-12-22 20:46:12 +0300
committerMike Kaganski <>2018-02-03 07:49:12 +0100
commit585d9806961342e95f7318fb947bd31e9f86dee0 (patch)
tree99e31f1d2a7ec385540a405053e05cc6c109defd /
parenta1c36eff089c3cd695bd78090575ca1c7677121e (diff)
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,, 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: Reviewed-by: Michael Stahl <> Tested-by: Jenkins <>
Diffstat (limited to '')
1 files changed, 8 insertions, 2 deletions
diff --git a/ b/
index 94f2bd333d28..85264b4afdf3 100644
--- a/
+++ b/
@@ -115,10 +115,16 @@ ifeq (SANE,$(filter SANE,$(BUILD_TYPE)))
define gb_LinkTarget__use_sane_headers
$(call gb_LinkTarget_set_include,$(1),\
- -I$(SRCDIR)/external/$(if $(filter WNT,$(OS)),twain,sane)/inc \
- $$(INCLUDE) \
+ $(if $(filter WNT,$(OS)), \
+ -I$(call gb_UnpackedTarball_get_dir,twain_dsm/pub/include), \
+ -I$(SRCDIR)/external/sane/inc) \
+ $$(INCLUDE) \
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_use_unpacked,$(1),twain_dsm)