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/twain_dsm/TWAIN_DSM_VS2015.vcxproj.filters.patch | |
| 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/twain_dsm/TWAIN_DSM_VS2015.vcxproj.filters.patch')
| -rw-r--r-- | external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.filters.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.filters.patch b/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.filters.patch new file mode 100644 index 000000000000..e73ae63dc855 --- /dev/null +++ b/external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.filters.patch @@ -0,0 +1,54 @@ +diff --git a/visual_studio/TWAIN_DSM_VS2015.vcxproj.filters b/visual_studio/TWAIN_DSM_VS2015.vcxproj.filters +new file mode 100755 +index 000000000000..a17a30d0097f +--- /dev/null ++++ b/visual_studio/TWAIN_DSM_VS2015.vcxproj.filters +@@ -0,0 +1,47 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup> ++ <Filter Include="Source Files"> ++ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> ++ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> ++ </Filter> ++ <Filter Include="Header Files"> ++ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> ++ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> ++ </Filter> ++ <Filter Include="Resource Files"> ++ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> ++ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions> ++ </Filter> ++ </ItemGroup> ++ <ItemGroup> ++ <ClCompile Include="..\src\apps.cpp"> ++ <Filter>Source Files</Filter> ++ </ClCompile> ++ <ClCompile Include="..\src\dsm.cpp"> ++ <Filter>Source Files</Filter> ++ </ClCompile> ++ <ClCompile Include="..\src\hook.cpp"> ++ <Filter>Source Files</Filter> ++ </ClCompile> ++ <ClCompile Include="..\src\log.cpp"> ++ <Filter>Source Files</Filter> ++ </ClCompile> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\src\dsm.h"> ++ <Filter>Header Files</Filter> ++ </ClInclude> ++ <ClInclude Include="..\src\resource.h"> ++ <Filter>Header Files</Filter> ++ </ClInclude> ++ <ClInclude Include="..\src\twain.h"> ++ <Filter>Header Files</Filter> ++ </ClInclude> ++ </ItemGroup> ++ <ItemGroup> ++ <ResourceCompile Include="..\src\dsm.rc"> ++ <Filter>Resource Files</Filter> ++ </ResourceCompile> ++ </ItemGroup> ++</Project> +\ No newline at end of file |