Browse code
Remove dependancy on c:\clamdeps
Jake Fehr authored on 2017/05/03 03:55:49Showing 18 changed files
- libclamav/libmspack-0.5alpha/mspack/chmd.c
- libclamav/libmspack-0.5alpha/mspack/mspack.def
- libclamav/libmspack-0.5alpha/mspack/mspack.vcxproj
- libclamav/libmspack-0.5alpha/mspack/mspack.vcxproj.filters
- win32/ClamAV.sln
- win32/clamav-for-windows/clamav-for-windows/clamav-for-windows.vcxproj
- win32/clamav-for-windows/freshclamwrap/freshclamwrap.vcxproj
- win32/clambc.vcxproj
- win32/clamconf.vcxproj
- win32/clamd.vcxproj
- win32/clamdscan.vcxproj
- win32/clamscan.vcxproj
- win32/freshclam.vcxproj
- win32/libclamav.vcxproj
- win32/libclamavcxx.vcxproj
- win32/libclamunrar.vcxproj
- win32/libclamunrar_iface.vcxproj
- win32/sigtool.vcxproj
| ... | ... |
@@ -533,7 +533,7 @@ static int chmd_fast_find(struct mschm_decompressor *base, |
| 533 | 533 |
struct mschm_decompressor_p *self = (struct mschm_decompressor_p *) base; |
| 534 | 534 |
struct mspack_system *sys; |
| 535 | 535 |
struct mspack_file *fh; |
| 536 |
- const unsigned char *chunk, *p, *end; |
|
| 536 |
+ const unsigned char *chunk, *p = NULL, *end = NULL; |
|
| 537 | 537 |
int err = MSPACK_ERR_OK, result = -1; |
| 538 | 538 |
unsigned int n, sec; |
| 539 | 539 |
|
| ... | ... |
@@ -1,5 +1,5 @@ |
| 1 |
-LIBRARY mspack |
|
| 2 |
-EXPORTS |
|
| 1 |
+LIBRARY mspack |
|
| 2 |
+EXPORTS |
|
| 3 | 3 |
mspack_create_cab_compressor |
| 4 | 4 |
mspack_create_cab_decompressor |
| 5 | 5 |
mspack_create_chm_compressor |
| ... | ... |
@@ -25,4 +25,4 @@ EXPORTS |
| 25 | 25 |
mspack_destroy_szdd_compressor |
| 26 | 26 |
mspack_destroy_szdd_decompressor |
| 27 | 27 |
mspack_sys_selftest_internal |
| 28 |
- mspack_version |
|
| 28 |
+ mspack_version |
|
| 29 | 29 |
\ No newline at end of file |
| 30 | 30 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,207 @@ |
| 0 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 1 |
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|
| 2 |
+ <ItemGroup Label="ProjectConfigurations"> |
|
| 3 |
+ <ProjectConfiguration Include="Debug|Win32"> |
|
| 4 |
+ <Configuration>Debug</Configuration> |
|
| 5 |
+ <Platform>Win32</Platform> |
|
| 6 |
+ </ProjectConfiguration> |
|
| 7 |
+ <ProjectConfiguration Include="Release|Win32"> |
|
| 8 |
+ <Configuration>Release</Configuration> |
|
| 9 |
+ <Platform>Win32</Platform> |
|
| 10 |
+ </ProjectConfiguration> |
|
| 11 |
+ <ProjectConfiguration Include="Debug|x64"> |
|
| 12 |
+ <Configuration>Debug</Configuration> |
|
| 13 |
+ <Platform>x64</Platform> |
|
| 14 |
+ </ProjectConfiguration> |
|
| 15 |
+ <ProjectConfiguration Include="Release|x64"> |
|
| 16 |
+ <Configuration>Release</Configuration> |
|
| 17 |
+ <Platform>x64</Platform> |
|
| 18 |
+ </ProjectConfiguration> |
|
| 19 |
+ </ItemGroup> |
|
| 20 |
+ <PropertyGroup Label="Globals"> |
|
| 21 |
+ <ProjectGuid>{AA443662-4AED-4F50-95E4-9B5BB5429E9E}</ProjectGuid>
|
|
| 22 |
+ <Keyword>Win32Proj</Keyword> |
|
| 23 |
+ <RootNamespace>mspack</RootNamespace> |
|
| 24 |
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> |
|
| 25 |
+ </PropertyGroup> |
|
| 26 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 27 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
|
| 28 |
+ <ConfigurationType>DynamicLibrary</ConfigurationType> |
|
| 29 |
+ <UseDebugLibraries>true</UseDebugLibraries> |
|
| 30 |
+ <PlatformToolset>v140</PlatformToolset> |
|
| 31 |
+ <CharacterSet>Unicode</CharacterSet> |
|
| 32 |
+ </PropertyGroup> |
|
| 33 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
|
| 34 |
+ <ConfigurationType>DynamicLibrary</ConfigurationType> |
|
| 35 |
+ <UseDebugLibraries>false</UseDebugLibraries> |
|
| 36 |
+ <PlatformToolset>v140</PlatformToolset> |
|
| 37 |
+ <WholeProgramOptimization>true</WholeProgramOptimization> |
|
| 38 |
+ <CharacterSet>Unicode</CharacterSet> |
|
| 39 |
+ </PropertyGroup> |
|
| 40 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
|
| 41 |
+ <ConfigurationType>DynamicLibrary</ConfigurationType> |
|
| 42 |
+ <UseDebugLibraries>true</UseDebugLibraries> |
|
| 43 |
+ <PlatformToolset>v140</PlatformToolset> |
|
| 44 |
+ <CharacterSet>Unicode</CharacterSet> |
|
| 45 |
+ </PropertyGroup> |
|
| 46 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
|
| 47 |
+ <ConfigurationType>DynamicLibrary</ConfigurationType> |
|
| 48 |
+ <UseDebugLibraries>false</UseDebugLibraries> |
|
| 49 |
+ <PlatformToolset>v140</PlatformToolset> |
|
| 50 |
+ <WholeProgramOptimization>true</WholeProgramOptimization> |
|
| 51 |
+ <CharacterSet>Unicode</CharacterSet> |
|
| 52 |
+ </PropertyGroup> |
|
| 53 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 54 |
+ <ImportGroup Label="ExtensionSettings"> |
|
| 55 |
+ </ImportGroup> |
|
| 56 |
+ <ImportGroup Label="Shared"> |
|
| 57 |
+ </ImportGroup> |
|
| 58 |
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
|
| 59 |
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
| 60 |
+ </ImportGroup> |
|
| 61 |
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
|
| 62 |
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
| 63 |
+ </ImportGroup> |
|
| 64 |
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
|
| 65 |
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
| 66 |
+ </ImportGroup> |
|
| 67 |
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
|
| 68 |
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
| 69 |
+ </ImportGroup> |
|
| 70 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 71 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
|
| 72 |
+ <LinkIncremental>true</LinkIncremental> |
|
| 73 |
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
|
| 74 |
+ </PropertyGroup> |
|
| 75 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
|
| 76 |
+ <LinkIncremental>true</LinkIncremental> |
|
| 77 |
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
|
| 78 |
+ </PropertyGroup> |
|
| 79 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
|
| 80 |
+ <LinkIncremental>false</LinkIncremental> |
|
| 81 |
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
|
| 82 |
+ </PropertyGroup> |
|
| 83 |
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
|
| 84 |
+ <LinkIncremental>false</LinkIncremental> |
|
| 85 |
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
|
| 86 |
+ </PropertyGroup> |
|
| 87 |
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
|
| 88 |
+ <ClCompile> |
|
| 89 |
+ <PrecompiledHeader> |
|
| 90 |
+ </PrecompiledHeader> |
|
| 91 |
+ <WarningLevel>Level3</WarningLevel> |
|
| 92 |
+ <Optimization>Disabled</Optimization> |
|
| 93 |
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 94 |
+ <SDLCheck>true</SDLCheck> |
|
| 95 |
+ <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
|
| 96 |
+ </ClCompile> |
|
| 97 |
+ <Link> |
|
| 98 |
+ <SubSystem>Windows</SubSystem> |
|
| 99 |
+ <GenerateDebugInformation>true</GenerateDebugInformation> |
|
| 100 |
+ <ModuleDefinitionFile>mspack.def</ModuleDefinitionFile> |
|
| 101 |
+ </Link> |
|
| 102 |
+ </ItemDefinitionGroup> |
|
| 103 |
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
|
| 104 |
+ <ClCompile> |
|
| 105 |
+ <PrecompiledHeader> |
|
| 106 |
+ </PrecompiledHeader> |
|
| 107 |
+ <WarningLevel>Level3</WarningLevel> |
|
| 108 |
+ <Optimization>Disabled</Optimization> |
|
| 109 |
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 110 |
+ <SDLCheck>true</SDLCheck> |
|
| 111 |
+ <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
|
| 112 |
+ </ClCompile> |
|
| 113 |
+ <Link> |
|
| 114 |
+ <SubSystem>Windows</SubSystem> |
|
| 115 |
+ <GenerateDebugInformation>true</GenerateDebugInformation> |
|
| 116 |
+ <ModuleDefinitionFile>mspack.def</ModuleDefinitionFile> |
|
| 117 |
+ </Link> |
|
| 118 |
+ </ItemDefinitionGroup> |
|
| 119 |
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
|
| 120 |
+ <ClCompile> |
|
| 121 |
+ <WarningLevel>Level3</WarningLevel> |
|
| 122 |
+ <PrecompiledHeader> |
|
| 123 |
+ </PrecompiledHeader> |
|
| 124 |
+ <Optimization>MaxSpeed</Optimization> |
|
| 125 |
+ <FunctionLevelLinking>true</FunctionLevelLinking> |
|
| 126 |
+ <IntrinsicFunctions>true</IntrinsicFunctions> |
|
| 127 |
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 128 |
+ <SDLCheck>true</SDLCheck> |
|
| 129 |
+ <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
|
| 130 |
+ </ClCompile> |
|
| 131 |
+ <Link> |
|
| 132 |
+ <SubSystem>Windows</SubSystem> |
|
| 133 |
+ <EnableCOMDATFolding>true</EnableCOMDATFolding> |
|
| 134 |
+ <OptimizeReferences>true</OptimizeReferences> |
|
| 135 |
+ <GenerateDebugInformation>true</GenerateDebugInformation> |
|
| 136 |
+ <ModuleDefinitionFile>mspack.def</ModuleDefinitionFile> |
|
| 137 |
+ </Link> |
|
| 138 |
+ </ItemDefinitionGroup> |
|
| 139 |
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
|
| 140 |
+ <ClCompile> |
|
| 141 |
+ <WarningLevel>Level3</WarningLevel> |
|
| 142 |
+ <PrecompiledHeader> |
|
| 143 |
+ </PrecompiledHeader> |
|
| 144 |
+ <Optimization>MaxSpeed</Optimization> |
|
| 145 |
+ <FunctionLevelLinking>true</FunctionLevelLinking> |
|
| 146 |
+ <IntrinsicFunctions>true</IntrinsicFunctions> |
|
| 147 |
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 148 |
+ <SDLCheck>true</SDLCheck> |
|
| 149 |
+ <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
|
| 150 |
+ </ClCompile> |
|
| 151 |
+ <Link> |
|
| 152 |
+ <SubSystem>Windows</SubSystem> |
|
| 153 |
+ <EnableCOMDATFolding>true</EnableCOMDATFolding> |
|
| 154 |
+ <OptimizeReferences>true</OptimizeReferences> |
|
| 155 |
+ <GenerateDebugInformation>true</GenerateDebugInformation> |
|
| 156 |
+ <ModuleDefinitionFile>mspack.def</ModuleDefinitionFile> |
|
| 157 |
+ </Link> |
|
| 158 |
+ </ItemDefinitionGroup> |
|
| 159 |
+ <ItemGroup> |
|
| 160 |
+ <ClCompile Include="cabc.c" /> |
|
| 161 |
+ <ClCompile Include="cabd.c" /> |
|
| 162 |
+ <ClCompile Include="chmc.c" /> |
|
| 163 |
+ <ClCompile Include="chmd.c" /> |
|
| 164 |
+ <ClCompile Include="crc32.c" /> |
|
| 165 |
+ <ClCompile Include="hlpc.c" /> |
|
| 166 |
+ <ClCompile Include="hlpd.c" /> |
|
| 167 |
+ <ClCompile Include="kwajc.c" /> |
|
| 168 |
+ <ClCompile Include="kwajd.c" /> |
|
| 169 |
+ <ClCompile Include="litc.c" /> |
|
| 170 |
+ <ClCompile Include="litd.c" /> |
|
| 171 |
+ <ClCompile Include="lzssd.c" /> |
|
| 172 |
+ <ClCompile Include="lzxc.c" /> |
|
| 173 |
+ <ClCompile Include="lzxd.c" /> |
|
| 174 |
+ <ClCompile Include="mszipc.c" /> |
|
| 175 |
+ <ClCompile Include="mszipd.c" /> |
|
| 176 |
+ <ClCompile Include="oabc.c" /> |
|
| 177 |
+ <ClCompile Include="oabd.c" /> |
|
| 178 |
+ <ClCompile Include="qtmd.c" /> |
|
| 179 |
+ <ClCompile Include="system.c" /> |
|
| 180 |
+ <ClCompile Include="szddc.c" /> |
|
| 181 |
+ <ClCompile Include="szddd.c" /> |
|
| 182 |
+ </ItemGroup> |
|
| 183 |
+ <ItemGroup> |
|
| 184 |
+ <ClInclude Include="cab.h" /> |
|
| 185 |
+ <ClInclude Include="chm.h" /> |
|
| 186 |
+ <ClInclude Include="crc32.h" /> |
|
| 187 |
+ <ClInclude Include="des.h" /> |
|
| 188 |
+ <ClInclude Include="hlp.h" /> |
|
| 189 |
+ <ClInclude Include="kwaj.h" /> |
|
| 190 |
+ <ClInclude Include="lit.h" /> |
|
| 191 |
+ <ClInclude Include="lzss.h" /> |
|
| 192 |
+ <ClInclude Include="lzx.h" /> |
|
| 193 |
+ <ClInclude Include="mspack.h" /> |
|
| 194 |
+ <ClInclude Include="mszip.h" /> |
|
| 195 |
+ <ClInclude Include="oab.h" /> |
|
| 196 |
+ <ClInclude Include="qtm.h" /> |
|
| 197 |
+ <ClInclude Include="readbits.h" /> |
|
| 198 |
+ <ClInclude Include="readhuff.h" /> |
|
| 199 |
+ <ClInclude Include="sha.h" /> |
|
| 200 |
+ <ClInclude Include="system.h" /> |
|
| 201 |
+ <ClInclude Include="szdd.h" /> |
|
| 202 |
+ </ItemGroup> |
|
| 203 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 204 |
+ <ImportGroup Label="ExtensionTargets"> |
|
| 205 |
+ </ImportGroup> |
|
| 206 |
+</Project> |
|
| 0 | 207 |
\ No newline at end of file |
| 1 | 208 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,141 @@ |
| 0 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 1 |
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|
| 2 |
+ <ItemGroup> |
|
| 3 |
+ <Filter Include="Source Files"> |
|
| 4 |
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
|
| 5 |
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> |
|
| 6 |
+ </Filter> |
|
| 7 |
+ <Filter Include="Header Files"> |
|
| 8 |
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
|
| 9 |
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> |
|
| 10 |
+ </Filter> |
|
| 11 |
+ <Filter Include="Resource Files"> |
|
| 12 |
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
|
| 13 |
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> |
|
| 14 |
+ </Filter> |
|
| 15 |
+ </ItemGroup> |
|
| 16 |
+ <ItemGroup> |
|
| 17 |
+ <ClCompile Include="cabc.c"> |
|
| 18 |
+ <Filter>Source Files</Filter> |
|
| 19 |
+ </ClCompile> |
|
| 20 |
+ <ClCompile Include="cabd.c"> |
|
| 21 |
+ <Filter>Source Files</Filter> |
|
| 22 |
+ </ClCompile> |
|
| 23 |
+ <ClCompile Include="chmc.c"> |
|
| 24 |
+ <Filter>Source Files</Filter> |
|
| 25 |
+ </ClCompile> |
|
| 26 |
+ <ClCompile Include="chmd.c"> |
|
| 27 |
+ <Filter>Source Files</Filter> |
|
| 28 |
+ </ClCompile> |
|
| 29 |
+ <ClCompile Include="crc32.c"> |
|
| 30 |
+ <Filter>Source Files</Filter> |
|
| 31 |
+ </ClCompile> |
|
| 32 |
+ <ClCompile Include="hlpc.c"> |
|
| 33 |
+ <Filter>Source Files</Filter> |
|
| 34 |
+ </ClCompile> |
|
| 35 |
+ <ClCompile Include="hlpd.c"> |
|
| 36 |
+ <Filter>Source Files</Filter> |
|
| 37 |
+ </ClCompile> |
|
| 38 |
+ <ClCompile Include="kwajc.c"> |
|
| 39 |
+ <Filter>Source Files</Filter> |
|
| 40 |
+ </ClCompile> |
|
| 41 |
+ <ClCompile Include="kwajd.c"> |
|
| 42 |
+ <Filter>Source Files</Filter> |
|
| 43 |
+ </ClCompile> |
|
| 44 |
+ <ClCompile Include="litc.c"> |
|
| 45 |
+ <Filter>Source Files</Filter> |
|
| 46 |
+ </ClCompile> |
|
| 47 |
+ <ClCompile Include="litd.c"> |
|
| 48 |
+ <Filter>Source Files</Filter> |
|
| 49 |
+ </ClCompile> |
|
| 50 |
+ <ClCompile Include="lzssd.c"> |
|
| 51 |
+ <Filter>Source Files</Filter> |
|
| 52 |
+ </ClCompile> |
|
| 53 |
+ <ClCompile Include="lzxc.c"> |
|
| 54 |
+ <Filter>Source Files</Filter> |
|
| 55 |
+ </ClCompile> |
|
| 56 |
+ <ClCompile Include="lzxd.c"> |
|
| 57 |
+ <Filter>Source Files</Filter> |
|
| 58 |
+ </ClCompile> |
|
| 59 |
+ <ClCompile Include="mszipc.c"> |
|
| 60 |
+ <Filter>Source Files</Filter> |
|
| 61 |
+ </ClCompile> |
|
| 62 |
+ <ClCompile Include="mszipd.c"> |
|
| 63 |
+ <Filter>Source Files</Filter> |
|
| 64 |
+ </ClCompile> |
|
| 65 |
+ <ClCompile Include="oabc.c"> |
|
| 66 |
+ <Filter>Source Files</Filter> |
|
| 67 |
+ </ClCompile> |
|
| 68 |
+ <ClCompile Include="oabd.c"> |
|
| 69 |
+ <Filter>Source Files</Filter> |
|
| 70 |
+ </ClCompile> |
|
| 71 |
+ <ClCompile Include="qtmd.c"> |
|
| 72 |
+ <Filter>Source Files</Filter> |
|
| 73 |
+ </ClCompile> |
|
| 74 |
+ <ClCompile Include="system.c"> |
|
| 75 |
+ <Filter>Source Files</Filter> |
|
| 76 |
+ </ClCompile> |
|
| 77 |
+ <ClCompile Include="szddc.c"> |
|
| 78 |
+ <Filter>Source Files</Filter> |
|
| 79 |
+ </ClCompile> |
|
| 80 |
+ <ClCompile Include="szddd.c"> |
|
| 81 |
+ <Filter>Source Files</Filter> |
|
| 82 |
+ </ClCompile> |
|
| 83 |
+ </ItemGroup> |
|
| 84 |
+ <ItemGroup> |
|
| 85 |
+ <ClInclude Include="cab.h"> |
|
| 86 |
+ <Filter>Header Files</Filter> |
|
| 87 |
+ </ClInclude> |
|
| 88 |
+ <ClInclude Include="chm.h"> |
|
| 89 |
+ <Filter>Header Files</Filter> |
|
| 90 |
+ </ClInclude> |
|
| 91 |
+ <ClInclude Include="crc32.h"> |
|
| 92 |
+ <Filter>Header Files</Filter> |
|
| 93 |
+ </ClInclude> |
|
| 94 |
+ <ClInclude Include="des.h"> |
|
| 95 |
+ <Filter>Header Files</Filter> |
|
| 96 |
+ </ClInclude> |
|
| 97 |
+ <ClInclude Include="hlp.h"> |
|
| 98 |
+ <Filter>Header Files</Filter> |
|
| 99 |
+ </ClInclude> |
|
| 100 |
+ <ClInclude Include="kwaj.h"> |
|
| 101 |
+ <Filter>Header Files</Filter> |
|
| 102 |
+ </ClInclude> |
|
| 103 |
+ <ClInclude Include="lit.h"> |
|
| 104 |
+ <Filter>Header Files</Filter> |
|
| 105 |
+ </ClInclude> |
|
| 106 |
+ <ClInclude Include="lzss.h"> |
|
| 107 |
+ <Filter>Header Files</Filter> |
|
| 108 |
+ </ClInclude> |
|
| 109 |
+ <ClInclude Include="lzx.h"> |
|
| 110 |
+ <Filter>Header Files</Filter> |
|
| 111 |
+ </ClInclude> |
|
| 112 |
+ <ClInclude Include="mspack.h"> |
|
| 113 |
+ <Filter>Header Files</Filter> |
|
| 114 |
+ </ClInclude> |
|
| 115 |
+ <ClInclude Include="mszip.h"> |
|
| 116 |
+ <Filter>Header Files</Filter> |
|
| 117 |
+ </ClInclude> |
|
| 118 |
+ <ClInclude Include="oab.h"> |
|
| 119 |
+ <Filter>Header Files</Filter> |
|
| 120 |
+ </ClInclude> |
|
| 121 |
+ <ClInclude Include="qtm.h"> |
|
| 122 |
+ <Filter>Header Files</Filter> |
|
| 123 |
+ </ClInclude> |
|
| 124 |
+ <ClInclude Include="readbits.h"> |
|
| 125 |
+ <Filter>Header Files</Filter> |
|
| 126 |
+ </ClInclude> |
|
| 127 |
+ <ClInclude Include="readhuff.h"> |
|
| 128 |
+ <Filter>Header Files</Filter> |
|
| 129 |
+ </ClInclude> |
|
| 130 |
+ <ClInclude Include="sha.h"> |
|
| 131 |
+ <Filter>Header Files</Filter> |
|
| 132 |
+ </ClInclude> |
|
| 133 |
+ <ClInclude Include="system.h"> |
|
| 134 |
+ <Filter>Header Files</Filter> |
|
| 135 |
+ </ClInclude> |
|
| 136 |
+ <ClInclude Include="szdd.h"> |
|
| 137 |
+ <Filter>Header Files</Filter> |
|
| 138 |
+ </ClInclude> |
|
| 139 |
+ </ItemGroup> |
|
| 140 |
+</Project> |
|
| 0 | 141 |
\ No newline at end of file |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
|
| 2 | 2 |
Microsoft Visual Studio Solution File, Format Version 12.00 |
| 3 | 3 |
# Visual Studio 14 |
| 4 |
-VisualStudioVersion = 14.0.24720.0 |
|
| 4 |
+VisualStudioVersion = 14.0.25420.1 |
|
| 5 | 5 |
MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | 6 |
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamavcxx", "libclamavcxx.vcxproj", "{3AE8051D-A188-4B11-95A4-14B8F0C290CB}"
|
| 7 | 7 |
ProjectSection(ProjectDependencies) = postProject |
| ... | ... |
@@ -22,6 +22,7 @@ EndProject |
| 22 | 22 |
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamav", "libclamav.vcxproj", "{09D341E9-7372-46E9-B0D7-CAAF77984190}"
|
| 23 | 23 |
ProjectSection(ProjectDependencies) = postProject |
| 24 | 24 |
{3AE8051D-A188-4B11-95A4-14B8F0C290CB} = {3AE8051D-A188-4B11-95A4-14B8F0C290CB}
|
| 25 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E} = {AA443662-4AED-4F50-95E4-9B5BB5429E9E}
|
|
| 25 | 26 |
EndProjectSection |
| 26 | 27 |
EndProject |
| 27 | 28 |
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigtool", "sigtool.vcxproj", "{05957B93-39F9-45EC-87BD-86B7AF571557}"
|
| ... | ... |
@@ -70,6 +71,8 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x86", "Setup-x86\Setu
|
| 70 | 70 |
EndProject |
| 71 | 71 |
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x64", "Setup-x64\Setup-x64.vdproj", "{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}"
|
| 72 | 72 |
EndProject |
| 73 |
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mspack", "..\libclamav\libmspack-0.5alpha\mspack\mspack.vcxproj", "{AA443662-4AED-4F50-95E4-9B5BB5429E9E}"
|
|
| 74 |
+EndProject |
|
| 73 | 75 |
Global |
| 74 | 76 |
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| 75 | 77 |
Debug|Win32 = Debug|Win32 |
| ... | ... |
@@ -276,6 +279,18 @@ Global |
| 276 | 276 |
{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|x64.Build.0 = Release
|
| 277 | 277 |
{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|Win32.ActiveCfg = Release
|
| 278 | 278 |
{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|x64.ActiveCfg = Release
|
| 279 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
| 280 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Debug|Win32.Build.0 = Debug|Win32
|
|
| 281 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Debug|x64.ActiveCfg = Debug|x64
|
|
| 282 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Debug|x64.Build.0 = Debug|x64
|
|
| 283 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release|Win32.ActiveCfg = Release|Win32
|
|
| 284 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release|Win32.Build.0 = Release|Win32
|
|
| 285 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release|x64.ActiveCfg = Release|x64
|
|
| 286 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release|x64.Build.0 = Release|x64
|
|
| 287 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release-Static|Win32.ActiveCfg = Release|Win32
|
|
| 288 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release-Static|Win32.Build.0 = Release|Win32
|
|
| 289 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release-Static|x64.ActiveCfg = Release|x64
|
|
| 290 |
+ {AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Release-Static|x64.Build.0 = Release|x64
|
|
| 279 | 291 |
EndGlobalSection |
| 280 | 292 |
GlobalSection(SolutionProperties) = preSolution |
| 281 | 293 |
HideSolutionNode = FALSE |
| ... | ... |
@@ -91,8 +91,8 @@ |
| 91 | 91 |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
| 92 | 92 |
<WarningLevel>Level3</WarningLevel> |
| 93 | 93 |
<Optimization>Disabled</Optimization> |
| 94 |
- <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;_DEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 95 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 94 |
+ <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;HAVE_STRUCT_TIMESPEC;_DEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 95 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 96 | 96 |
<CompileAs>CompileAsC</CompileAs> |
| 97 | 97 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 98 | 98 |
</ClCompile> |
| ... | ... |
@@ -101,7 +101,7 @@ |
| 101 | 101 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 102 | 102 |
<DelayLoadDLLs>libclamav.dll</DelayLoadDLLs> |
| 103 | 103 |
<AdditionalDependencies>libclamav.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 104 |
- <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;C:\clamdeps\win32\openssl\lib</AdditionalLibraryDirectories> |
|
| 104 |
+ <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories> |
|
| 105 | 105 |
</Link> |
| 106 | 106 |
<ResourceCompile> |
| 107 | 107 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -112,8 +112,8 @@ |
| 112 | 112 |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
| 113 | 113 |
<WarningLevel>Level3</WarningLevel> |
| 114 | 114 |
<Optimization>Disabled</Optimization> |
| 115 |
- <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;_DEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 116 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 115 |
+ <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;HAVE_STRUCT_TIMESPEC;_DEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 116 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 117 | 117 |
<CompileAs>CompileAsC</CompileAs> |
| 118 | 118 |
<DisableSpecificWarnings>4996;4267</DisableSpecificWarnings> |
| 119 | 119 |
</ClCompile> |
| ... | ... |
@@ -122,7 +122,7 @@ |
| 122 | 122 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 123 | 123 |
<DelayLoadDLLs>libclamav.dll</DelayLoadDLLs> |
| 124 | 124 |
<AdditionalDependencies>libclamav.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 125 |
- <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;C:\clamdeps\win64\openssl\lib</AdditionalLibraryDirectories> |
|
| 125 |
+ <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories> |
|
| 126 | 126 |
</Link> |
| 127 | 127 |
<ResourceCompile> |
| 128 | 128 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -135,8 +135,8 @@ |
| 135 | 135 |
<Optimization>MaxSpeed</Optimization> |
| 136 | 136 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 137 | 137 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 138 |
- <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;NDEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 139 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 138 |
+ <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;HAVE_STRUCT_TIMESPEC;NDEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 139 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 140 | 140 |
<CompileAs>CompileAsC</CompileAs> |
| 141 | 141 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 142 | 142 |
</ClCompile> |
| ... | ... |
@@ -147,7 +147,7 @@ |
| 147 | 147 |
<OptimizeReferences>true</OptimizeReferences> |
| 148 | 148 |
<DelayLoadDLLs>libclamav.dll</DelayLoadDLLs> |
| 149 | 149 |
<AdditionalDependencies>libclamav.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 150 |
- <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;C:\clamdeps\win32\openssl\lib</AdditionalLibraryDirectories> |
|
| 150 |
+ <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories> |
|
| 151 | 151 |
</Link> |
| 152 | 152 |
<ResourceCompile> |
| 153 | 153 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -160,8 +160,8 @@ |
| 160 | 160 |
<Optimization>MaxSpeed</Optimization> |
| 161 | 161 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 162 | 162 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 163 |
- <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;NDEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 164 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 163 |
+ <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;HAVE_STRUCT_TIMESPEC;NDEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
| 164 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 165 | 165 |
<CompileAs>CompileAsC</CompileAs> |
| 166 | 166 |
<DisableSpecificWarnings>4996;4267</DisableSpecificWarnings> |
| 167 | 167 |
</ClCompile> |
| ... | ... |
@@ -172,7 +172,7 @@ |
| 172 | 172 |
<OptimizeReferences>true</OptimizeReferences> |
| 173 | 173 |
<DelayLoadDLLs>libclamav.dll</DelayLoadDLLs> |
| 174 | 174 |
<AdditionalDependencies>libclamav.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 175 |
- <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;C:\clamdeps\win64\openssl\lib</AdditionalLibraryDirectories> |
|
| 175 |
+ <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories> |
|
| 176 | 176 |
</Link> |
| 177 | 177 |
<ResourceCompile> |
| 178 | 178 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -103,7 +103,7 @@ |
| 103 | 103 |
</PrecompiledHeaderFile> |
| 104 | 104 |
<PrecompiledHeaderOutputFile> |
| 105 | 105 |
</PrecompiledHeaderOutputFile> |
| 106 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 106 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 107 | 107 |
<CompileAs>CompileAsC</CompileAs> |
| 108 | 108 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 109 | 109 |
</ClCompile> |
| ... | ... |
@@ -111,7 +111,7 @@ |
| 111 | 111 |
<SubSystem>Windows</SubSystem> |
| 112 | 112 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 113 | 113 |
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 114 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 114 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 115 | 115 |
</Link> |
| 116 | 116 |
<ResourceCompile> |
| 117 | 117 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -127,7 +127,7 @@ |
| 127 | 127 |
</PrecompiledHeaderFile> |
| 128 | 128 |
<PrecompiledHeaderOutputFile> |
| 129 | 129 |
</PrecompiledHeaderOutputFile> |
| 130 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 130 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 131 | 131 |
<CompileAs>CompileAsC</CompileAs> |
| 132 | 132 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 133 | 133 |
</ClCompile> |
| ... | ... |
@@ -135,7 +135,7 @@ |
| 135 | 135 |
<SubSystem>Windows</SubSystem> |
| 136 | 136 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 137 | 137 |
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 138 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 138 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 139 | 139 |
</Link> |
| 140 | 140 |
<ResourceCompile> |
| 141 | 141 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -153,7 +153,7 @@ |
| 153 | 153 |
</PrecompiledHeaderFile> |
| 154 | 154 |
<PrecompiledHeaderOutputFile> |
| 155 | 155 |
</PrecompiledHeaderOutputFile> |
| 156 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 156 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 157 | 157 |
<CompileAs>CompileAsC</CompileAs> |
| 158 | 158 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 159 | 159 |
</ClCompile> |
| ... | ... |
@@ -163,7 +163,7 @@ |
| 163 | 163 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 164 | 164 |
<OptimizeReferences>true</OptimizeReferences> |
| 165 | 165 |
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 166 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 166 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 167 | 167 |
</Link> |
| 168 | 168 |
<ResourceCompile> |
| 169 | 169 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -181,7 +181,7 @@ |
| 181 | 181 |
</PrecompiledHeaderFile> |
| 182 | 182 |
<PrecompiledHeaderOutputFile> |
| 183 | 183 |
</PrecompiledHeaderOutputFile> |
| 184 |
- <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 184 |
+ <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 185 | 185 |
<CompileAs>CompileAsC</CompileAs> |
| 186 | 186 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 187 | 187 |
</ClCompile> |
| ... | ... |
@@ -191,7 +191,7 @@ |
| 191 | 191 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 192 | 192 |
<OptimizeReferences>true</OptimizeReferences> |
| 193 | 193 |
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 194 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 194 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 195 | 195 |
</Link> |
| 196 | 196 |
<ResourceCompile> |
| 197 | 197 |
<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| ... | ... |
@@ -130,14 +130,14 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| 137 | 137 |
<Link> |
| 138 | 138 |
<SubSystem>Console</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 140 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 | 141 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 142 | 142 |
</Link> |
| 143 | 143 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -147,14 +147,14 @@ |
| 147 | 147 |
<WarningLevel>Level3</WarningLevel> |
| 148 | 148 |
<Optimization>Disabled</Optimization> |
| 149 | 149 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 150 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 150 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 151 | 151 |
<CompileAs>CompileAsC</CompileAs> |
| 152 | 152 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 153 | 153 |
</ClCompile> |
| 154 | 154 |
<Link> |
| 155 | 155 |
<SubSystem>Console</SubSystem> |
| 156 | 156 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 157 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 157 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 158 | 158 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 159 | 159 |
</Link> |
| 160 | 160 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -166,7 +166,7 @@ |
| 166 | 166 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 167 | 167 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 168 | 168 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 169 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 169 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 170 | 170 |
<CompileAs>CompileAsC</CompileAs> |
| 171 | 171 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 172 | 172 |
</ClCompile> |
| ... | ... |
@@ -175,7 +175,7 @@ |
| 175 | 175 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 176 | 176 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 177 | 177 |
<OptimizeReferences>true</OptimizeReferences> |
| 178 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 178 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 179 | 179 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 180 | 180 |
</Link> |
| 181 | 181 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -187,7 +187,7 @@ |
| 187 | 187 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 188 | 188 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 189 | 189 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 190 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 190 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 191 | 191 |
<CompileAs>CompileAsC</CompileAs> |
| 192 | 192 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 193 | 193 |
</ClCompile> |
| ... | ... |
@@ -196,7 +196,7 @@ |
| 196 | 196 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 197 | 197 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 198 | 198 |
<OptimizeReferences>true</OptimizeReferences> |
| 199 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 199 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 200 | 200 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 201 | 201 |
</Link> |
| 202 | 202 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -208,7 +208,7 @@ |
| 208 | 208 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 209 | 209 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 210 | 210 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 211 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 211 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 212 | 212 |
<CompileAs>CompileAsC</CompileAs> |
| 213 | 213 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 214 | 214 |
</ClCompile> |
| ... | ... |
@@ -217,7 +217,7 @@ |
| 217 | 217 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 218 | 218 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 219 | 219 |
<OptimizeReferences>true</OptimizeReferences> |
| 220 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 220 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 221 | 221 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 222 | 222 |
</Link> |
| 223 | 223 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -229,7 +229,7 @@ |
| 229 | 229 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 230 | 230 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 231 | 231 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 232 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 232 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 233 | 233 |
<CompileAs>CompileAsC</CompileAs> |
| 234 | 234 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 235 | 235 |
</ClCompile> |
| ... | ... |
@@ -238,7 +238,7 @@ |
| 238 | 238 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 239 | 239 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 240 | 240 |
<OptimizeReferences>true</OptimizeReferences> |
| 241 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 241 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 242 | 242 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 243 | 243 |
</Link> |
| 244 | 244 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -130,14 +130,14 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| 137 | 137 |
<Link> |
| 138 | 138 |
<SubSystem>Console</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 140 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 | 141 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 142 | 142 |
</Link> |
| 143 | 143 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -147,14 +147,14 @@ |
| 147 | 147 |
<WarningLevel>Level3</WarningLevel> |
| 148 | 148 |
<Optimization>Disabled</Optimization> |
| 149 | 149 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 150 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 150 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 151 | 151 |
<CompileAs>CompileAsC</CompileAs> |
| 152 | 152 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 153 | 153 |
</ClCompile> |
| 154 | 154 |
<Link> |
| 155 | 155 |
<SubSystem>Console</SubSystem> |
| 156 | 156 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 157 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 157 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 158 | 158 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 159 | 159 |
</Link> |
| 160 | 160 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -166,7 +166,7 @@ |
| 166 | 166 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 167 | 167 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 168 | 168 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 169 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 169 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 170 | 170 |
<CompileAs>CompileAsC</CompileAs> |
| 171 | 171 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 172 | 172 |
</ClCompile> |
| ... | ... |
@@ -175,7 +175,7 @@ |
| 175 | 175 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 176 | 176 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 177 | 177 |
<OptimizeReferences>true</OptimizeReferences> |
| 178 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 178 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 179 | 179 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 180 | 180 |
</Link> |
| 181 | 181 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -187,7 +187,7 @@ |
| 187 | 187 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 188 | 188 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 189 | 189 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 190 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 190 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 191 | 191 |
<CompileAs>CompileAsC</CompileAs> |
| 192 | 192 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 193 | 193 |
</ClCompile> |
| ... | ... |
@@ -196,7 +196,7 @@ |
| 196 | 196 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 197 | 197 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 198 | 198 |
<OptimizeReferences>true</OptimizeReferences> |
| 199 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 199 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 200 | 200 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 201 | 201 |
</Link> |
| 202 | 202 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -208,7 +208,7 @@ |
| 208 | 208 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 209 | 209 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 210 | 210 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 211 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 211 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 212 | 212 |
<CompileAs>CompileAsC</CompileAs> |
| 213 | 213 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 214 | 214 |
</ClCompile> |
| ... | ... |
@@ -217,7 +217,7 @@ |
| 217 | 217 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 218 | 218 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 219 | 219 |
<OptimizeReferences>true</OptimizeReferences> |
| 220 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 220 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 221 | 221 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 222 | 222 |
</Link> |
| 223 | 223 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -229,7 +229,7 @@ |
| 229 | 229 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 230 | 230 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 231 | 231 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 232 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 232 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 233 | 233 |
<CompileAs>CompileAsC</CompileAs> |
| 234 | 234 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 235 | 235 |
</ClCompile> |
| ... | ... |
@@ -238,7 +238,7 @@ |
| 238 | 238 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 239 | 239 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 240 | 240 |
<OptimizeReferences>true</OptimizeReferences> |
| 241 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 241 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 242 | 242 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 243 | 243 |
</Link> |
| 244 | 244 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -130,14 +130,14 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| 137 | 137 |
<Link> |
| 138 | 138 |
<SubSystem>Console</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 140 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 | 141 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 142 | 142 |
</Link> |
| 143 | 143 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -147,14 +147,14 @@ |
| 147 | 147 |
<WarningLevel>Level3</WarningLevel> |
| 148 | 148 |
<Optimization>Disabled</Optimization> |
| 149 | 149 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 150 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 150 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 151 | 151 |
<CompileAs>CompileAsC</CompileAs> |
| 152 | 152 |
<DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings> |
| 153 | 153 |
</ClCompile> |
| 154 | 154 |
<Link> |
| 155 | 155 |
<SubSystem>Console</SubSystem> |
| 156 | 156 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 157 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 157 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 158 | 158 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 159 | 159 |
</Link> |
| 160 | 160 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -166,7 +166,7 @@ |
| 166 | 166 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 167 | 167 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 168 | 168 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 169 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 169 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 170 | 170 |
<CompileAs>CompileAsC</CompileAs> |
| 171 | 171 |
<DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings> |
| 172 | 172 |
</ClCompile> |
| ... | ... |
@@ -175,7 +175,7 @@ |
| 175 | 175 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 176 | 176 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 177 | 177 |
<OptimizeReferences>true</OptimizeReferences> |
| 178 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 178 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 179 | 179 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 180 | 180 |
</Link> |
| 181 | 181 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -187,7 +187,7 @@ |
| 187 | 187 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 188 | 188 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 189 | 189 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 190 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 190 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 191 | 191 |
<CompileAs>CompileAsC</CompileAs> |
| 192 | 192 |
<DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings> |
| 193 | 193 |
</ClCompile> |
| ... | ... |
@@ -196,7 +196,7 @@ |
| 196 | 196 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 197 | 197 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 198 | 198 |
<OptimizeReferences>true</OptimizeReferences> |
| 199 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 199 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 200 | 200 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 201 | 201 |
</Link> |
| 202 | 202 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -208,7 +208,7 @@ |
| 208 | 208 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 209 | 209 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 210 | 210 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 211 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 211 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 212 | 212 |
<CompileAs>CompileAsC</CompileAs> |
| 213 | 213 |
<DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings> |
| 214 | 214 |
</ClCompile> |
| ... | ... |
@@ -217,7 +217,7 @@ |
| 217 | 217 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 218 | 218 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 219 | 219 |
<OptimizeReferences>true</OptimizeReferences> |
| 220 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 220 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 221 | 221 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 222 | 222 |
</Link> |
| 223 | 223 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -229,7 +229,7 @@ |
| 229 | 229 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 230 | 230 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 231 | 231 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 232 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 232 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 233 | 233 |
<CompileAs>CompileAsC</CompileAs> |
| 234 | 234 |
<DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings> |
| 235 | 235 |
</ClCompile> |
| ... | ... |
@@ -238,7 +238,7 @@ |
| 238 | 238 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 239 | 239 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 240 | 240 |
<OptimizeReferences>true</OptimizeReferences> |
| 241 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 241 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 242 | 242 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 243 | 243 |
</Link> |
| 244 | 244 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -130,14 +130,14 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| 137 | 137 |
<Link> |
| 138 | 138 |
<SubSystem>Console</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 140 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 | 141 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 142 | 142 |
</Link> |
| 143 | 143 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -147,14 +147,14 @@ |
| 147 | 147 |
<WarningLevel>Level3</WarningLevel> |
| 148 | 148 |
<Optimization>Disabled</Optimization> |
| 149 | 149 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 150 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 150 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 151 | 151 |
<CompileAs>CompileAsC</CompileAs> |
| 152 | 152 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 153 | 153 |
</ClCompile> |
| 154 | 154 |
<Link> |
| 155 | 155 |
<SubSystem>Console</SubSystem> |
| 156 | 156 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 157 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 157 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 158 | 158 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 159 | 159 |
</Link> |
| 160 | 160 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -166,7 +166,7 @@ |
| 166 | 166 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 167 | 167 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 168 | 168 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 169 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 169 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 170 | 170 |
<CompileAs>CompileAsC</CompileAs> |
| 171 | 171 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 172 | 172 |
</ClCompile> |
| ... | ... |
@@ -175,7 +175,7 @@ |
| 175 | 175 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 176 | 176 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 177 | 177 |
<OptimizeReferences>true</OptimizeReferences> |
| 178 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 178 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 179 | 179 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 180 | 180 |
</Link> |
| 181 | 181 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -187,7 +187,7 @@ |
| 187 | 187 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 188 | 188 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 189 | 189 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 190 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 190 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 191 | 191 |
<CompileAs>CompileAsC</CompileAs> |
| 192 | 192 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 193 | 193 |
</ClCompile> |
| ... | ... |
@@ -196,7 +196,7 @@ |
| 196 | 196 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 197 | 197 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 198 | 198 |
<OptimizeReferences>true</OptimizeReferences> |
| 199 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 199 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 200 | 200 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 201 | 201 |
</Link> |
| 202 | 202 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -208,7 +208,7 @@ |
| 208 | 208 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 209 | 209 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 210 | 210 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 211 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 211 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 212 | 212 |
<CompileAs>CompileAsC</CompileAs> |
| 213 | 213 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 214 | 214 |
</ClCompile> |
| ... | ... |
@@ -217,7 +217,7 @@ |
| 217 | 217 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 218 | 218 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 219 | 219 |
<OptimizeReferences>true</OptimizeReferences> |
| 220 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 220 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 221 | 221 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 222 | 222 |
</Link> |
| 223 | 223 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -229,7 +229,7 @@ |
| 229 | 229 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 230 | 230 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 231 | 231 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 232 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 232 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatfromName)\include</AdditionalIncludeDirectories> |
|
| 233 | 233 |
<CompileAs>CompileAsC</CompileAs> |
| 234 | 234 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 235 | 235 |
</ClCompile> |
| ... | ... |
@@ -238,7 +238,7 @@ |
| 238 | 238 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 239 | 239 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 240 | 240 |
<OptimizeReferences>true</OptimizeReferences> |
| 241 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 241 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 242 | 242 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 243 | 243 |
</Link> |
| 244 | 244 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -130,7 +130,7 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| ... | ... |
@@ -146,14 +146,14 @@ |
| 146 | 146 |
<WarningLevel>Level3</WarningLevel> |
| 147 | 147 |
<Optimization>Disabled</Optimization> |
| 148 | 148 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 149 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 149 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 150 | 150 |
<CompileAs>CompileAsC</CompileAs> |
| 151 | 151 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 152 | 152 |
</ClCompile> |
| 153 | 153 |
<Link> |
| 154 | 154 |
<SubSystem>Console</SubSystem> |
| 155 | 155 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 156 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 156 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 157 | 157 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 158 | 158 |
</Link> |
| 159 | 159 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -165,7 +165,7 @@ |
| 165 | 165 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 166 | 166 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 167 | 167 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 168 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 168 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 169 | 169 |
<CompileAs>CompileAsC</CompileAs> |
| 170 | 170 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 171 | 171 |
</ClCompile> |
| ... | ... |
@@ -174,7 +174,7 @@ |
| 174 | 174 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 175 | 175 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 176 | 176 |
<OptimizeReferences>true</OptimizeReferences> |
| 177 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 177 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 178 | 178 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 179 | 179 |
</Link> |
| 180 | 180 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -186,7 +186,7 @@ |
| 186 | 186 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 187 | 187 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 188 | 188 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 189 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 189 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 190 | 190 |
<CompileAs>CompileAsC</CompileAs> |
| 191 | 191 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 192 | 192 |
</ClCompile> |
| ... | ... |
@@ -195,7 +195,7 @@ |
| 195 | 195 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 196 | 196 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 197 | 197 |
<OptimizeReferences>true</OptimizeReferences> |
| 198 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 198 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 199 | 199 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 200 | 200 |
</Link> |
| 201 | 201 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -207,7 +207,7 @@ |
| 207 | 207 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 208 | 208 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 209 | 209 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 210 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 210 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 211 | 211 |
<CompileAs>CompileAsC</CompileAs> |
| 212 | 212 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 213 | 213 |
</ClCompile> |
| ... | ... |
@@ -216,7 +216,7 @@ |
| 216 | 216 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 217 | 217 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 218 | 218 |
<OptimizeReferences>true</OptimizeReferences> |
| 219 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 219 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 220 | 220 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 221 | 221 |
</Link> |
| 222 | 222 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -228,7 +228,7 @@ |
| 228 | 228 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 229 | 229 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 230 | 230 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 231 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 231 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 232 | 232 |
<CompileAs>CompileAsC</CompileAs> |
| 233 | 233 |
<DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings> |
| 234 | 234 |
</ClCompile> |
| ... | ... |
@@ -237,7 +237,7 @@ |
| 237 | 237 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 238 | 238 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 239 | 239 |
<OptimizeReferences>true</OptimizeReferences> |
| 240 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 240 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 241 | 241 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 242 | 242 |
</Link> |
| 243 | 243 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -130,7 +130,7 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| ... | ... |
@@ -138,7 +138,7 @@ |
| 138 | 138 |
<SubSystem>Console</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 | 140 |
<AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 141 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 142 | 142 |
</Link> |
| 143 | 143 |
</ItemDefinitionGroup> |
| 144 | 144 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -147,7 +147,7 @@ |
| 147 | 147 |
<WarningLevel>Level3</WarningLevel> |
| 148 | 148 |
<Optimization>Disabled</Optimization> |
| 149 | 149 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 150 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 150 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 151 | 151 |
<CompileAs>CompileAsC</CompileAs> |
| 152 | 152 |
<DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings> |
| 153 | 153 |
</ClCompile> |
| ... | ... |
@@ -155,7 +155,7 @@ |
| 155 | 155 |
<SubSystem>Console</SubSystem> |
| 156 | 156 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 157 | 157 |
<AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 158 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 158 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 159 | 159 |
</Link> |
| 160 | 160 |
</ItemDefinitionGroup> |
| 161 | 161 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| ... | ... |
@@ -166,7 +166,7 @@ |
| 166 | 166 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 167 | 167 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 168 | 168 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 169 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 169 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 170 | 170 |
<CompileAs>CompileAsC</CompileAs> |
| 171 | 171 |
<DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings> |
| 172 | 172 |
</ClCompile> |
| ... | ... |
@@ -176,7 +176,7 @@ |
| 176 | 176 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 177 | 177 |
<OptimizeReferences>true</OptimizeReferences> |
| 178 | 178 |
<AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 179 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 179 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 180 | 180 |
</Link> |
| 181 | 181 |
</ItemDefinitionGroup> |
| 182 | 182 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'"> |
| ... | ... |
@@ -187,7 +187,7 @@ |
| 187 | 187 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 188 | 188 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 189 | 189 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 190 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 190 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 191 | 191 |
<CompileAs>CompileAsC</CompileAs> |
| 192 | 192 |
<DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings> |
| 193 | 193 |
</ClCompile> |
| ... | ... |
@@ -197,7 +197,7 @@ |
| 197 | 197 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 198 | 198 |
<OptimizeReferences>true</OptimizeReferences> |
| 199 | 199 |
<AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 200 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 200 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 201 | 201 |
</Link> |
| 202 | 202 |
</ItemDefinitionGroup> |
| 203 | 203 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
| ... | ... |
@@ -208,7 +208,7 @@ |
| 208 | 208 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 209 | 209 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 210 | 210 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 211 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 211 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 212 | 212 |
<CompileAs>CompileAsC</CompileAs> |
| 213 | 213 |
<DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings> |
| 214 | 214 |
</ClCompile> |
| ... | ... |
@@ -218,7 +218,7 @@ |
| 218 | 218 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 219 | 219 |
<OptimizeReferences>true</OptimizeReferences> |
| 220 | 220 |
<AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 221 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 221 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 222 | 222 |
</Link> |
| 223 | 223 |
</ItemDefinitionGroup> |
| 224 | 224 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> |
| ... | ... |
@@ -229,7 +229,7 @@ |
| 229 | 229 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 230 | 230 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 231 | 231 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 232 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 232 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 233 | 233 |
<CompileAs>CompileAsC</CompileAs> |
| 234 | 234 |
<DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings> |
| 235 | 235 |
</ClCompile> |
| ... | ... |
@@ -239,7 +239,7 @@ |
| 239 | 239 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 240 | 240 |
<OptimizeReferences>true</OptimizeReferences> |
| 241 | 241 |
<AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 242 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 242 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 243 | 243 |
</Link> |
| 244 | 244 |
</ItemDefinitionGroup> |
| 245 | 245 |
<ItemGroup> |
| ... | ... |
@@ -95,17 +95,14 @@ |
| 95 | 95 |
</ImportGroup> |
| 96 | 96 |
<PropertyGroup Label="UserMacros" /> |
| 97 | 97 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 98 |
- <LinkIncremental>true</LinkIncremental> |
|
| 99 | 98 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| 100 | 99 |
<OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
| 101 | 100 |
</PropertyGroup> |
| 102 | 101 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| 103 |
- <LinkIncremental>true</LinkIncremental> |
|
| 104 | 102 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| 105 | 103 |
<OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
| 106 | 104 |
</PropertyGroup> |
| 107 | 105 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 108 |
- <LinkIncremental>false</LinkIncremental> |
|
| 109 | 106 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| 110 | 107 |
<OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
| 111 | 108 |
</PropertyGroup> |
| ... | ... |
@@ -115,7 +112,6 @@ |
| 115 | 115 |
<OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
| 116 | 116 |
</PropertyGroup> |
| 117 | 117 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
| 118 |
- <LinkIncremental>false</LinkIncremental> |
|
| 119 | 118 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| 120 | 119 |
<OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
| 121 | 120 |
</PropertyGroup> |
| ... | ... |
@@ -130,16 +126,16 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include;C:\clamdeps\win32\mspack\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;..\libclamav\libmspack-0.5alpha\mspack;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| 137 | 137 |
<Link> |
| 138 | 138 |
<SubSystem>Windows</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 |
- <AdditionalDependencies>ws2_32.lib;C:\clamdeps\win32\mspack\lib\mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 140 |
+ <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 141 | 141 |
<ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile> |
| 142 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;C:\clamdeps\win32\mspack\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 142 |
+ <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 143 | 143 |
</Link> |
| 144 | 144 |
</ItemDefinitionGroup> |
| 145 | 145 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -148,16 +144,16 @@ |
| 148 | 148 |
<WarningLevel>Level3</WarningLevel> |
| 149 | 149 |
<Optimization>Disabled</Optimization> |
| 150 | 150 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 151 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include;C:\clamdeps\win64\mspack\include</AdditionalIncludeDirectories> |
|
| 151 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;..\libclamav\libmspack-0.5alpha\mspack;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 152 | 152 |
<CompileAs>CompileAsC</CompileAs> |
| 153 | 153 |
<DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings> |
| 154 | 154 |
</ClCompile> |
| 155 | 155 |
<Link> |
| 156 | 156 |
<SubSystem>Windows</SubSystem> |
| 157 | 157 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 158 |
- <AdditionalDependencies>ws2_32.lib;C:\clamdeps\win64\mspack\lib\mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 158 |
+ <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 159 | 159 |
<ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile> |
| 160 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;C:\clamdeps\win64\mspack\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 160 |
+ <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 161 | 161 |
</Link> |
| 162 | 162 |
</ItemDefinitionGroup> |
| 163 | 163 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| ... | ... |
@@ -168,7 +164,7 @@ |
| 168 | 168 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 169 | 169 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 170 | 170 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 171 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include;C:\clamdeps\win32\mspack\include</AdditionalIncludeDirectories> |
|
| 171 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;..\libclamav\libmspack-0.5alpha\mspack;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 172 | 172 |
<CompileAs>CompileAsC</CompileAs> |
| 173 | 173 |
<DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings> |
| 174 | 174 |
</ClCompile> |
| ... | ... |
@@ -177,9 +173,9 @@ |
| 177 | 177 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 178 | 178 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 179 | 179 |
<OptimizeReferences>true</OptimizeReferences> |
| 180 |
- <AdditionalDependencies>ws2_32.lib;C:\clamdeps\win32\mspack\lib\mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 180 |
+ <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 181 | 181 |
<ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile> |
| 182 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;C:\clamdeps\win32\mspack\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 182 |
+ <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories> |
|
| 183 | 183 |
</Link> |
| 184 | 184 |
</ItemDefinitionGroup> |
| 185 | 185 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'"> |
| ... | ... |
@@ -190,7 +186,7 @@ |
| 190 | 190 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 191 | 191 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 192 | 192 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 193 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include;C:\clamdeps\win32\mspack\include</AdditionalIncludeDirectories> |
|
| 193 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;..\libclamav\libmspack-0.5alpha\mspack;$(CLAM_DEPENDANCIES)\$(PlatformName)\include;..\libclamav\libmspack-0.5alpha\mspack</AdditionalIncludeDirectories> |
|
| 194 | 194 |
<CompileAs>CompileAsC</CompileAs> |
| 195 | 195 |
<DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings> |
| 196 | 196 |
</ClCompile> |
| ... | ... |
@@ -199,9 +195,9 @@ |
| 199 | 199 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 200 | 200 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 201 | 201 |
<OptimizeReferences>true</OptimizeReferences> |
| 202 |
- <AdditionalDependencies>ws2_32.lib;C:\clamdeps\win32\mspack\lib\mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 202 |
+ <AdditionalDependencies>ws2_32.lib;mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 203 | 203 |
<ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile> |
| 204 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;C:\clamdeps\win32\mspack\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 204 |
+ <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\Release;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 205 | 205 |
</Link> |
| 206 | 206 |
</ItemDefinitionGroup> |
| 207 | 207 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
| ... | ... |
@@ -212,7 +208,7 @@ |
| 212 | 212 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 213 | 213 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 214 | 214 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 215 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include;C:\clamdeps\win64\mspack\include</AdditionalIncludeDirectories> |
|
| 215 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;..\libclamav\libmspack-0.5alpha\mspack;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 216 | 216 |
<CompileAs>CompileAsC</CompileAs> |
| 217 | 217 |
<DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings> |
| 218 | 218 |
</ClCompile> |
| ... | ... |
@@ -221,9 +217,9 @@ |
| 221 | 221 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 222 | 222 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 223 | 223 |
<OptimizeReferences>true</OptimizeReferences> |
| 224 |
- <AdditionalDependencies>ws2_32.lib;C:\clamdeps\win64\mspack\lib\mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 224 |
+ <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 225 | 225 |
<ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile> |
| 226 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\bin;C:\clamdeps\win64\mspack\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 226 |
+ <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 227 | 227 |
</Link> |
| 228 | 228 |
</ItemDefinitionGroup> |
| 229 | 229 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> |
| ... | ... |
@@ -234,7 +230,7 @@ |
| 234 | 234 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 235 | 235 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 236 | 236 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;LIBCLAMAV_STATIC;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 237 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include;C:\clamdeps\win64\mspack\include</AdditionalIncludeDirectories> |
|
| 237 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;..\libclamav\libmspack-0.5alpha\mspack;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 238 | 238 |
<CompileAs>CompileAsC</CompileAs> |
| 239 | 239 |
<DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings> |
| 240 | 240 |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| ... | ... |
@@ -244,12 +240,12 @@ |
| 244 | 244 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 245 | 245 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 246 | 246 |
<OptimizeReferences>true</OptimizeReferences> |
| 247 |
- <AdditionalDependencies>ws2_32.lib;C:\clamdeps\win64\mspack\lib\mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 247 |
+ <AdditionalDependencies>ws2_32.lib;mspack.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
| 248 | 248 |
<ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile> |
| 249 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;C:\clamdeps\win64\mspack\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 249 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 250 | 250 |
</Link> |
| 251 | 251 |
<Lib> |
| 252 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;C:\clamdeps\win64\mspack\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 252 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 253 | 253 |
</Lib> |
| 254 | 254 |
</ItemDefinitionGroup> |
| 255 | 255 |
<ItemGroup> |
| ... | ... |
@@ -130,7 +130,7 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsCpp</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| ... | ... |
@@ -145,7 +145,7 @@ |
| 145 | 145 |
<WarningLevel>Level3</WarningLevel> |
| 146 | 146 |
<Optimization>Disabled</Optimization> |
| 147 | 147 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 148 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 148 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 149 | 149 |
<CompileAs>CompileAsCpp</CompileAs> |
| 150 | 150 |
<DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings> |
| 151 | 151 |
</ClCompile> |
| ... | ... |
@@ -162,7 +162,7 @@ |
| 162 | 162 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 163 | 163 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 164 | 164 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 165 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 165 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 166 | 166 |
<CompileAs>CompileAsCpp</CompileAs> |
| 167 | 167 |
<DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings> |
| 168 | 168 |
</ClCompile> |
| ... | ... |
@@ -181,7 +181,7 @@ |
| 181 | 181 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 182 | 182 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 183 | 183 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 184 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 184 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 185 | 185 |
<CompileAs>CompileAsCpp</CompileAs> |
| 186 | 186 |
<DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings> |
| 187 | 187 |
</ClCompile> |
| ... | ... |
@@ -200,7 +200,7 @@ |
| 200 | 200 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 201 | 201 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 202 | 202 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 203 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 203 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 204 | 204 |
<CompileAs>CompileAsCpp</CompileAs> |
| 205 | 205 |
<DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings> |
| 206 | 206 |
</ClCompile> |
| ... | ... |
@@ -219,7 +219,7 @@ |
| 219 | 219 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 220 | 220 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 221 | 221 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 222 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 222 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 223 | 223 |
<CompileAs>CompileAsCpp</CompileAs> |
| 224 | 224 |
<DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings> |
| 225 | 225 |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| ... | ... |
@@ -130,7 +130,7 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<DisableSpecificWarnings>4996;4018;4146;4244</DisableSpecificWarnings> |
| 135 | 135 |
<CompileAs>CompileAsC</CompileAs> |
| 136 | 136 |
</ClCompile> |
| ... | ... |
@@ -138,7 +138,7 @@ |
| 138 | 138 |
<SubSystem>Windows</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 | 140 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile> |
| 141 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 142 | 142 |
</Link> |
| 143 | 143 |
</ItemDefinitionGroup> |
| 144 | 144 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -147,7 +147,7 @@ |
| 147 | 147 |
<WarningLevel>Level3</WarningLevel> |
| 148 | 148 |
<Optimization>Disabled</Optimization> |
| 149 | 149 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 150 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 150 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 151 | 151 |
<DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings> |
| 152 | 152 |
<CompileAs>CompileAsC</CompileAs> |
| 153 | 153 |
</ClCompile> |
| ... | ... |
@@ -155,7 +155,7 @@ |
| 155 | 155 |
<SubSystem>Windows</SubSystem> |
| 156 | 156 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 157 | 157 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile> |
| 158 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 158 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 159 | 159 |
</Link> |
| 160 | 160 |
</ItemDefinitionGroup> |
| 161 | 161 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| ... | ... |
@@ -166,7 +166,7 @@ |
| 166 | 166 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 167 | 167 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 168 | 168 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 169 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 169 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 170 | 170 |
<DisableSpecificWarnings>4996;4018;4146;4244</DisableSpecificWarnings> |
| 171 | 171 |
<CompileAs>CompileAsC</CompileAs> |
| 172 | 172 |
</ClCompile> |
| ... | ... |
@@ -176,7 +176,7 @@ |
| 176 | 176 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 177 | 177 |
<OptimizeReferences>true</OptimizeReferences> |
| 178 | 178 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile> |
| 179 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 179 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 180 | 180 |
</Link> |
| 181 | 181 |
</ItemDefinitionGroup> |
| 182 | 182 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'"> |
| ... | ... |
@@ -187,7 +187,7 @@ |
| 187 | 187 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 188 | 188 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 189 | 189 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 190 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 190 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 191 | 191 |
<DisableSpecificWarnings>4996;4018;4146;4244</DisableSpecificWarnings> |
| 192 | 192 |
<CompileAs>CompileAsC</CompileAs> |
| 193 | 193 |
</ClCompile> |
| ... | ... |
@@ -197,7 +197,7 @@ |
| 197 | 197 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 198 | 198 |
<OptimizeReferences>true</OptimizeReferences> |
| 199 | 199 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile> |
| 200 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 200 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 201 | 201 |
</Link> |
| 202 | 202 |
</ItemDefinitionGroup> |
| 203 | 203 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
| ... | ... |
@@ -208,7 +208,7 @@ |
| 208 | 208 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 209 | 209 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 210 | 210 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 211 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 211 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 212 | 212 |
<DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings> |
| 213 | 213 |
<CompileAs>CompileAsC</CompileAs> |
| 214 | 214 |
</ClCompile> |
| ... | ... |
@@ -218,7 +218,7 @@ |
| 218 | 218 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 219 | 219 |
<OptimizeReferences>true</OptimizeReferences> |
| 220 | 220 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile> |
| 221 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 221 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 222 | 222 |
</Link> |
| 223 | 223 |
</ItemDefinitionGroup> |
| 224 | 224 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> |
| ... | ... |
@@ -229,7 +229,7 @@ |
| 229 | 229 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 230 | 230 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 231 | 231 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 232 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 232 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 233 | 233 |
<DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings> |
| 234 | 234 |
<CompileAs>CompileAsC</CompileAs> |
| 235 | 235 |
</ClCompile> |
| ... | ... |
@@ -239,7 +239,7 @@ |
| 239 | 239 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 240 | 240 |
<OptimizeReferences>true</OptimizeReferences> |
| 241 | 241 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile> |
| 242 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 242 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 243 | 243 |
</Link> |
| 244 | 244 |
</ItemDefinitionGroup> |
| 245 | 245 |
<ItemGroup> |
| ... | ... |
@@ -130,7 +130,7 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 135 | 135 |
<CompileAs>CompileAsC</CompileAs> |
| 136 | 136 |
</ClCompile> |
| ... | ... |
@@ -138,7 +138,7 @@ |
| 138 | 138 |
<SubSystem>Windows</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 | 140 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile> |
| 141 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 142 | 142 |
</Link> |
| 143 | 143 |
<ProjectReference /> |
| 144 | 144 |
<ProjectReference /> |
| ... | ... |
@@ -149,7 +149,7 @@ |
| 149 | 149 |
<WarningLevel>Level3</WarningLevel> |
| 150 | 150 |
<Optimization>Disabled</Optimization> |
| 151 | 151 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 152 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 152 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 153 | 153 |
<DisableSpecificWarnings>4996;4267</DisableSpecificWarnings> |
| 154 | 154 |
<CompileAs>CompileAsC</CompileAs> |
| 155 | 155 |
</ClCompile> |
| ... | ... |
@@ -157,7 +157,7 @@ |
| 157 | 157 |
<SubSystem>Windows</SubSystem> |
| 158 | 158 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 159 | 159 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile> |
| 160 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 160 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 161 | 161 |
</Link> |
| 162 | 162 |
<ProjectReference /> |
| 163 | 163 |
<ProjectReference /> |
| ... | ... |
@@ -170,7 +170,7 @@ |
| 170 | 170 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 171 | 171 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 172 | 172 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 173 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 173 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 174 | 174 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 175 | 175 |
<CompileAs>CompileAsC</CompileAs> |
| 176 | 176 |
</ClCompile> |
| ... | ... |
@@ -180,7 +180,7 @@ |
| 180 | 180 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 181 | 181 |
<OptimizeReferences>true</OptimizeReferences> |
| 182 | 182 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile> |
| 183 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 183 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 184 | 184 |
</Link> |
| 185 | 185 |
<ProjectReference /> |
| 186 | 186 |
<ProjectReference /> |
| ... | ... |
@@ -193,7 +193,7 @@ |
| 193 | 193 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 194 | 194 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 195 | 195 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 196 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 196 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 197 | 197 |
<DisableSpecificWarnings>4996</DisableSpecificWarnings> |
| 198 | 198 |
<CompileAs>CompileAsC</CompileAs> |
| 199 | 199 |
</ClCompile> |
| ... | ... |
@@ -203,7 +203,7 @@ |
| 203 | 203 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 204 | 204 |
<OptimizeReferences>true</OptimizeReferences> |
| 205 | 205 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile> |
| 206 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 206 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 207 | 207 |
</Link> |
| 208 | 208 |
<ProjectReference /> |
| 209 | 209 |
<ProjectReference /> |
| ... | ... |
@@ -216,7 +216,7 @@ |
| 216 | 216 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 217 | 217 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 218 | 218 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 219 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 219 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 220 | 220 |
<DisableSpecificWarnings>4996;4267</DisableSpecificWarnings> |
| 221 | 221 |
<CompileAs>CompileAsC</CompileAs> |
| 222 | 222 |
</ClCompile> |
| ... | ... |
@@ -226,7 +226,7 @@ |
| 226 | 226 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 227 | 227 |
<OptimizeReferences>true</OptimizeReferences> |
| 228 | 228 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile> |
| 229 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 229 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 230 | 230 |
</Link> |
| 231 | 231 |
<ProjectReference /> |
| 232 | 232 |
<ProjectReference /> |
| ... | ... |
@@ -239,7 +239,7 @@ |
| 239 | 239 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 240 | 240 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 241 | 241 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 242 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 242 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 243 | 243 |
<DisableSpecificWarnings>4996;4267</DisableSpecificWarnings> |
| 244 | 244 |
<CompileAs>CompileAsC</CompileAs> |
| 245 | 245 |
</ClCompile> |
| ... | ... |
@@ -249,7 +249,7 @@ |
| 249 | 249 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 250 | 250 |
<OptimizeReferences>true</OptimizeReferences> |
| 251 | 251 |
<ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile> |
| 252 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 252 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 253 | 253 |
</Link> |
| 254 | 254 |
<ProjectReference /> |
| 255 | 255 |
<ProjectReference /> |
| ... | ... |
@@ -130,14 +130,14 @@ |
| 130 | 130 |
<WarningLevel>Level3</WarningLevel> |
| 131 | 131 |
<Optimization>Disabled</Optimization> |
| 132 | 132 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 133 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 133 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 134 | 134 |
<CompileAs>CompileAsC</CompileAs> |
| 135 | 135 |
<DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings> |
| 136 | 136 |
</ClCompile> |
| 137 | 137 |
<Link> |
| 138 | 138 |
<SubSystem>Console</SubSystem> |
| 139 | 139 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 140 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 140 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 141 | 141 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 142 | 142 |
</Link> |
| 143 | 143 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -147,14 +147,14 @@ |
| 147 | 147 |
<WarningLevel>Level3</WarningLevel> |
| 148 | 148 |
<Optimization>Disabled</Optimization> |
| 149 | 149 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 150 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 150 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 151 | 151 |
<CompileAs>CompileAsC</CompileAs> |
| 152 | 152 |
<DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings> |
| 153 | 153 |
</ClCompile> |
| 154 | 154 |
<Link> |
| 155 | 155 |
<SubSystem>Console</SubSystem> |
| 156 | 156 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 157 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 157 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 158 | 158 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 159 | 159 |
</Link> |
| 160 | 160 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -166,7 +166,7 @@ |
| 166 | 166 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 167 | 167 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 168 | 168 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 169 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 169 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 170 | 170 |
<CompileAs>CompileAsC</CompileAs> |
| 171 | 171 |
<DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings> |
| 172 | 172 |
</ClCompile> |
| ... | ... |
@@ -175,7 +175,7 @@ |
| 175 | 175 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 176 | 176 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 177 | 177 |
<OptimizeReferences>true</OptimizeReferences> |
| 178 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 178 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 179 | 179 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 180 | 180 |
</Link> |
| 181 | 181 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -187,7 +187,7 @@ |
| 187 | 187 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 188 | 188 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 189 | 189 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 190 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 190 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 191 | 191 |
<CompileAs>CompileAsC</CompileAs> |
| 192 | 192 |
<DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings> |
| 193 | 193 |
</ClCompile> |
| ... | ... |
@@ -196,7 +196,7 @@ |
| 196 | 196 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 197 | 197 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 198 | 198 |
<OptimizeReferences>true</OptimizeReferences> |
| 199 |
- <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 199 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 200 | 200 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 201 | 201 |
</Link> |
| 202 | 202 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -208,7 +208,7 @@ |
| 208 | 208 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 209 | 209 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 210 | 210 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 211 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 211 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 212 | 212 |
<CompileAs>CompileAsC</CompileAs> |
| 213 | 213 |
<DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings> |
| 214 | 214 |
</ClCompile> |
| ... | ... |
@@ -217,7 +217,7 @@ |
| 217 | 217 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 218 | 218 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 219 | 219 |
<OptimizeReferences>true</OptimizeReferences> |
| 220 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 220 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 221 | 221 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 222 | 222 |
</Link> |
| 223 | 223 |
</ItemDefinitionGroup> |
| ... | ... |
@@ -229,7 +229,7 @@ |
| 229 | 229 |
<FunctionLevelLinking>true</FunctionLevelLinking> |
| 230 | 230 |
<IntrinsicFunctions>true</IntrinsicFunctions> |
| 231 | 231 |
<PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 232 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories> |
|
| 232 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories> |
|
| 233 | 233 |
<CompileAs>CompileAsC</CompileAs> |
| 234 | 234 |
<DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings> |
| 235 | 235 |
</ClCompile> |
| ... | ... |
@@ -238,7 +238,7 @@ |
| 238 | 238 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 239 | 239 |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 240 | 240 |
<OptimizeReferences>true</OptimizeReferences> |
| 241 |
- <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 241 |
+ <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 242 | 242 |
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 243 | 243 |
</Link> |
| 244 | 244 |
</ItemDefinitionGroup> |