Browse code

Fix spelling mistake

Jake Fehr authored on 2017/05/03 05:51:07
Showing 13 changed files
... ...
@@ -92,7 +92,7 @@
92 92
       <WarningLevel>Level3</WarningLevel>
93 93
       <Optimization>Disabled</Optimization>
94 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>
95
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
104
+      <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDENCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
105 105
     </Link>
106 106
     <ResourceCompile>
107 107
       <AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
... ...
@@ -113,7 +113,7 @@
113 113
       <WarningLevel>Level3</WarningLevel>
114 114
       <Optimization>Disabled</Optimization>
115 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>
116
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
125
+      <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDENCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
126 126
     </Link>
127 127
     <ResourceCompile>
128 128
       <AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
... ...
@@ -136,7 +136,7 @@
136 136
       <FunctionLevelLinking>true</FunctionLevelLinking>
137 137
       <IntrinsicFunctions>true</IntrinsicFunctions>
138 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>
139
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
150
+      <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDENCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
151 151
     </Link>
152 152
     <ResourceCompile>
153 153
       <AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
... ...
@@ -161,7 +161,7 @@
161 161
       <FunctionLevelLinking>true</FunctionLevelLinking>
162 162
       <IntrinsicFunctions>true</IntrinsicFunctions>
163 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>
164
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\3rdparty\zlib;$(SolutionDir)..\3rdparty\pthreads;$(SolutionDir)..\3rdparty\pcre;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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)\;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
175
+      <AdditionalLibraryDirectories>$(SolutionDir)..\$(PlatformName)\$(Configuration)\;$(CLAM_DEPENDENCIES)\$(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)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
106
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
130
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
156
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
166
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..\..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
184
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\..\libclamav;$(SolutionDir)..\compat;$(SolutionDir)..\..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
194
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
150
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
169
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
190
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
211
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
220
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
232
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
241
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
150
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
169
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
190
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
211
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
220
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
232
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
241
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
150
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
169
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
190
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
211
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
220
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
232
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
241
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
150
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
169
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
190
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
211
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
220
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatfromName)\include</AdditionalIncludeDirectories>
232
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
241
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
149
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
156
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
168
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
177
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
189
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
198
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
210
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
219
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
231
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
240
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
150
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
169
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
179
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
190
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
200
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
211
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
221
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
232
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
242
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
243 243
     </Link>
244 244
   </ItemDefinitionGroup>
245 245
   <ItemGroup>
... ...
@@ -126,7 +126,7 @@
126 126
       <WarningLevel>Level3</WarningLevel>
127 127
       <Optimization>Disabled</Optimization>
128 128
       <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>
129
-      <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>
129
+      <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_DEPENDENCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
130 130
       <CompileAs>CompileAsC</CompileAs>
131 131
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
132 132
     </ClCompile>
... ...
@@ -135,7 +135,7 @@
135 135
       <GenerateDebugInformation>true</GenerateDebugInformation>
136 136
       <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
137 137
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
138
-      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
139 139
     </Link>
140 140
   </ItemDefinitionGroup>
141 141
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -144,7 +144,7 @@
144 144
       <WarningLevel>Level3</WarningLevel>
145 145
       <Optimization>Disabled</Optimization>
146 146
       <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>
147
-      <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>
147
+      <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_DEPENDENCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
148 148
       <CompileAs>CompileAsC</CompileAs>
149 149
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
150 150
     </ClCompile>
... ...
@@ -153,7 +153,7 @@
153 153
       <GenerateDebugInformation>true</GenerateDebugInformation>
154 154
       <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
155 155
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
156
-      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
156
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157 157
     </Link>
158 158
   </ItemDefinitionGroup>
159 159
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -164,7 +164,7 @@
164 164
       <FunctionLevelLinking>true</FunctionLevelLinking>
165 165
       <IntrinsicFunctions>true</IntrinsicFunctions>
166 166
       <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>
167
-      <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>
167
+      <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_DEPENDENCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
168 168
       <CompileAs>CompileAsC</CompileAs>
169 169
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
170 170
     </ClCompile>
... ...
@@ -175,7 +175,7 @@
175 175
       <OptimizeReferences>true</OptimizeReferences>
176 176
       <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
177 177
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
178
-      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
178
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
179 179
     </Link>
180 180
   </ItemDefinitionGroup>
181 181
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
... ...
@@ -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;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189
-      <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>
189
+      <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_DEPENDENCIES)\$(PlatformName)\include;..\libclamav\libmspack-0.5alpha\mspack</AdditionalIncludeDirectories>
190 190
       <CompileAs>CompileAsC</CompileAs>
191 191
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
192 192
     </ClCompile>
... ...
@@ -197,7 +197,7 @@
197 197
       <OptimizeReferences>true</OptimizeReferences>
198 198
       <AdditionalDependencies>ws2_32.lib;mspack.lib;%(AdditionalDependencies)</AdditionalDependencies>
199 199
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
200
-      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\Release;$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
200
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\Release;$(CLAM_DEPENDENCIES)\$(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;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
211
-      <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>
211
+      <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_DEPENDENCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
212 212
       <CompileAs>CompileAsC</CompileAs>
213 213
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
214 214
     </ClCompile>
... ...
@@ -219,7 +219,7 @@
219 219
       <OptimizeReferences>true</OptimizeReferences>
220 220
       <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
221 221
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
222
-      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
222
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
223 223
     </Link>
224 224
   </ItemDefinitionGroup>
225 225
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
... ...
@@ -230,7 +230,7 @@
230 230
       <FunctionLevelLinking>true</FunctionLevelLinking>
231 231
       <IntrinsicFunctions>true</IntrinsicFunctions>
232 232
       <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>
233
-      <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>
233
+      <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_DEPENDENCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
234 234
       <CompileAs>CompileAsC</CompileAs>
235 235
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
236 236
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
... ...
@@ -242,10 +242,10 @@
242 242
       <OptimizeReferences>true</OptimizeReferences>
243 243
       <AdditionalDependencies>ws2_32.lib;mspack.lib;%(AdditionalDependencies)</AdditionalDependencies>
244 244
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
245
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
245
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
246 246
     </Link>
247 247
     <Lib>
248
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
248
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
249 249
     </Lib>
250 250
   </ItemDefinitionGroup>
251 251
   <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;$(CLAM_DEPENDANCIES)\$(PlatformName)\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_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\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_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\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_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\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_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\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_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\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_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
150
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
169
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
179
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
190
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
200
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
211
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
221
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
232
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
242
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
152
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
173
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
183
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
196
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
206
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
219
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
229
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
242
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
252
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
150
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
169
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
190
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
211
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
220
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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)..;$(CLAM_DEPENDANCIES)\$(PlatformName)\include</AdditionalIncludeDirectories>
232
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;$(CLAM_DEPENDENCIES)\$(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>$(CLAM_DEPENDANCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
241
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(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>