diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-12-22 20:46:12 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-03 07:49:12 +0100 |
| commit | 585d9806961342e95f7318fb947bd31e9f86dee0 (patch) | |
| tree | 99e31f1d2a7ec385540a405053e05cc6c109defd /external/Module_external.mk | |
| parent | a1c36eff089c3cd695bd78090575ca1c7677121e (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, 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 <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/Module_external.mk')
| -rw-r--r-- | external/Module_external.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index 59c709838e0f..41b895751d82 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -91,6 +91,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,RHINO,rhino) \ $(call gb_Helper_optional,SERF,serf) \ $(call gb_Helper_optional,STAROFFICE,libstaroffice) \ + $(if $(filter WNT,$(OS)),twain_dsm) \ $(call gb_Helper_optional,UCPP,ucpp) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ |