From b394b966df145f01619ba3dfa905db95c99d8c74 Mon Sep 17 00:00:00 2001 From: apriestman <apriestman@basistech.com> Date: Wed, 23 Sep 2020 08:47:00 -0400 Subject: [PATCH] Switch to our libewf package. --- win32/NugetPackages.props | 6 +++--- win32/libtsk/packages.config | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/win32/NugetPackages.props b/win32/NugetPackages.props index e19f72343..678c9aa55 100644 --- a/win32/NugetPackages.props +++ b/win32/NugetPackages.props @@ -7,9 +7,9 @@ <LibVhdiInclude>$(SolutionDir)\packages\libvhdi.20200810.0.0\lib\native\include</LibVhdiInclude> <LibVhdiLib Condition="'$(Platform)' == 'Win32'">$(SolutionDir)\packages\libvhdi.20200810.0.0\lib\native\lib\Win32</LibVhdiLib> <LibVhdiLib Condition="'$(Platform)' == 'x64'">$(SolutionDir)\packages\libvhdi.20200810.0.0\lib\native\lib\x64</LibVhdiLib> - <LibEwfInclude>$(SolutionDir)\packages\libewf.20140809.0.0\lib\native\include</LibEwfInclude> - <LibEwfLib Condition="'$(Platform)' == 'Win32'">$(SolutionDir)\packages\libewf.20140809.0.0\lib\native\lib\Win32</LibEwfLib> - <LibEwfLib Condition="'$(Platform)' == 'x64'">$(SolutionDir)\packages\libewf.20140809.0.0\lib\native\lib\x64</LibEwfLib> + <LibEwfInclude>$(SolutionDir)\packages\sleuthkit-libewf.20130416.0.0\build\native\include</LibEwfInclude> + <LibEwfLib Condition="'$(Platform)' == 'Win32'">$(SolutionDir)\packages\sleuthkit-libewf.20130416.0.0\build\native\msvscpp\Release</LibEwfLib> + <LibEwfLib Condition="'$(Platform)' == 'x64'">$(SolutionDir)\packages\sleuthkit-libewf.20130416.0.0\build\native\msvscpp\x64\Release</LibEwfLib> <ZlibInclude>$(SolutionDir)\packages\zlib_native.1.2.11\build\native\include</ZlibInclude> <ZlibLib Condition="'$(Platform)' == 'Win32'">$(SolutionDir)\packages\zlib_native.1.2.11\build\native\lib\Win32\Release</ZlibLib> <ZlibLib Condition="'$(Platform)' == 'x64'">$(SolutionDir)\packages\zlib_native.1.2.11\build\native\lib\x64\Release</ZlibLib> diff --git a/win32/libtsk/packages.config b/win32/libtsk/packages.config index 7248a2dda..7e7769b8c 100644 --- a/win32/libtsk/packages.config +++ b/win32/libtsk/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="libewf" version="20140809.0.0" targetFramework="native" /> + <package id="sleuthkit-libewf" version="20130416.0.0" targetFramework="native" /> <package id="libvhdi" version="20200810.0.0" targetFramework="native" /> <package id="libvmdk" version="20200810.0.0" targetFramework="native" /> <package id="openssl-vc140-vc141-x86_64" version="1.1.5" targetFramework="native" /> -- GitLab