diff --git a/tsk/img/ewf.h b/tsk/img/ewf.h index ea8fde887af10a3831ce9e7b60cedbd9fcc5a352..bab9c5f7bdb24ee5158c906b1856a7665f0b158f 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 60a6bfe2f0c686cd95bbf8e77abe92c2503c068e..297a45371208367e282b2fee9ff5f869e200bd1b 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 476298aaceb7d7ba465997ba1b15c6dca139867f..2e1dd4809e4eeff5c2ece30fcc9c5f30aaee6345 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>