diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-12-22 20:46:12 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-25 17:38:32 +0200 |
| commit | b7072853d9bbcdb6aea73db0b7ac5c5a15e56ac1 (patch) | |
| tree | d24e6db1ac793efd513213b3396780d55d0342e4 /RepositoryExternal.mk | |
| parent | 9cf5400c1059fd970f3646788510f58bcf85ed5d (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>
(cherry picked from commit 585d9806961342e95f7318fb947bd31e9f86dee0)
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9105397ae2a8..c672632af80b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -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) +endif + endef else |