Skip to content
Snippets Groups Projects
Unverified Commit 772b81d0 authored by Richard Cordovano's avatar Richard Cordovano Committed by GitHub
Browse files

Merge pull request #2029 from APriestman/6879_switchLibEwf 

6879 Switch to our libewf package.
parents 12ff90bd b394b966
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
win32/NugetPackages.props
+ 3
− 3
View file @ 772b81d0
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<LibVhdiInclude>$(SolutionDir)\packages\libvhdi.20200810.0.0\lib\native\include</LibVhdiInclude> <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)' == '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> <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> <LibEwfInclude>$(SolutionDir)\packages\sleuthkit-libewf.20130416.0.0\build\native\include</LibEwfInclude>
<LibEwfLib Condition="'$(Platform)' == 'Win32'">$(SolutionDir)\packages\libewf.20140809.0.0\lib\native\lib\Win32</LibEwfLib> <LibEwfLib Condition="'$(Platform)' == 'Win32'">$(SolutionDir)\packages\sleuthkit-libewf.20130416.0.0\build\native\msvscpp\Release</LibEwfLib>
<LibEwfLib Condition="'$(Platform)' == 'x64'">$(SolutionDir)\packages\libewf.20140809.0.0\lib\native\lib\x64</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> <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)' == '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> <ZlibLib Condition="'$(Platform)' == 'x64'">$(SolutionDir)\packages\zlib_native.1.2.11\build\native\lib\x64\Release</ZlibLib>
......
win32/libtsk/packages.config
+ 1
− 1
View file @ 772b81d0
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <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="libvhdi" version="20200810.0.0" targetFramework="native" />
<package id="libvmdk" 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" /> <package id="openssl-vc140-vc141-x86_64" version="1.1.5" targetFramework="native" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment