summaryrefslogtreecommitdiff
path: root/external/twain_dsm/UnpackedTarball_twain_dsm.mk
AgeCommit message (Collapse)AuthorFilesLines
2018-02-11Replace non-us-ascii characters that cause build failure on cp-950Mike Kaganski1-0/+2
Change-Id: Ic3d09cbc20b6bbfcaa15d46bae332945e42ccb3d Reviewed-on: https://gerrit.libreoffice.org/49560 Reviewed-by: Mark Hung <marklh9@gmail.com> Tested-by: Mark Hung <marklh9@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-02-03tdf#114635: Add TWAINDSM.DLL to 64-bit Windows packageMike Kaganski1-0/+21
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>