From 40c4b1a56d54db01758ccaa656562e1ee9b41631 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Tue, 15 Dec 2015 15:47:51 -0500
Subject: [PATCH] Fixed libtsk build errors
---
tsk/img/ewf.h | 6 +++---
tsk/img/vmdk.h | 6 +++---
win32/libtsk/libtsk.vcxproj | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tsk/img/ewf.h b/tsk/img/ewf.h
index ea8fde887..bab9c5f7b 100644
--- a/tsk/img/ewf.h
+++ b/tsk/img/ewf.h
@@ -19,9 +19,9 @@
#if HAVE_LIBEWF
// we used to check only for TSK_WIN32, but that fails on mingw
-#if defined(_MSC_VER)
-#include <config_msc.h>
-#endif
+//#if defined(_MSC_VER)
+//#include <config_msc.h>
+//#endif
#include <libewf.h>
diff --git a/tsk/img/vmdk.h b/tsk/img/vmdk.h
index 60a6bfe2f..297a45371 100644
--- a/tsk/img/vmdk.h
+++ b/tsk/img/vmdk.h
@@ -19,9 +19,9 @@
#if HAVE_LIBVMDK
// we used to check only for TSK_WIN32, but that fails on mingw
-#if defined(_MSC_VER)
-#include <config_msc.h>
-#endif
+//#if defined(_MSC_VER)
+//#include <config_msc.h>
+//#endif
// ELTODO perhaps undefine HAVE_MULTI_THREAD_SUPPORT
#if defined( TSK_WIN32 )
diff --git a/win32/libtsk/libtsk.vcxproj b/win32/libtsk/libtsk.vcxproj
index 476298aac..2e1dd4809 100755
--- a/win32/libtsk/libtsk.vcxproj
+++ b/win32/libtsk/libtsk.vcxproj
@@ -354,7 +354,7 @@ copy "$(SolutionDir)\PostgreSQL_CRT\win32\msvcr120.dll" "$(OutDir)" </Command>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\;$(LIBVMDK_HOME)\include;$(LIBEWF_HOME)\include;$(LIBEWF_HOME)\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;HAVE_LIBEWF_EL;HAVE_LIBVMDK;HAVE_LIBZ;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;HAVE_LIBEWF;HAVE_LIBVMDK;HAVE_LIBZ;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
--
GitLab