1. clamav-devel
  2. Commit 1218187d183c42d22a1882105bd7ba53cfc3c6ce
Browse code

Add OpenSSL linkage to Win64 builds.

Shawn Webb authored on 2014/02/13 02:43:20
Showing 10 changed files
win32/Setup-x64/Setup-x64.vdproj
History View file @ 1218187
... ... 
@@ -63,6 +63,12 @@
63 63 
         }
64 64 
         "Entry"
65 65 
         {
66 
+        "MsmKey" = "8:_65072ADBBB5441898759117DB2AC41EF"
67 
+        "OwnerKey" = "8:_UNDEFINED"
68 
+        "MsmSig" = "8:_UNDEFINED"
69 
+        }
70 
+        "Entry"
71 
+        {
66 72 
         "MsmKey" = "8:_65C31C39B3E443C4B6EBE65247933F5E"
67 73 
         "OwnerKey" = "8:_UNDEFINED"
68 74 
         "MsmSig" = "8:_UNDEFINED"
... ... 
@@ -117,66 +123,6 @@
117 117 
         }
118 118 
         "Entry"
119 119 
         {
120 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
121 
-        "OwnerKey" = "8:_DF09DF52E5014B378FBA8B4CD6C11C3B"
122 
-        "MsmSig" = "8:_UNDEFINED"
123 
-        }
124 
-        "Entry"
125 
-        {
126 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
127 
-        "OwnerKey" = "8:_65C31C39B3E443C4B6EBE65247933F5E"
128 
-        "MsmSig" = "8:_UNDEFINED"
129 
-        }
130 
-        "Entry"
131 
-        {
132 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
133 
-        "OwnerKey" = "8:_C0DFAFFC11514B9190D3A585C3E58832"
134 
-        "MsmSig" = "8:_UNDEFINED"
135 
-        }
136 
-        "Entry"
137 
-        {
138 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
139 
-        "OwnerKey" = "8:_804379F8A48A4F7DBB50D72302559297"
140 
-        "MsmSig" = "8:_UNDEFINED"
141 
-        }
142 
-        "Entry"
143 
-        {
144 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
145 
-        "OwnerKey" = "8:_71984994A7494BE2965C585DB3EBED1F"
146 
-        "MsmSig" = "8:_UNDEFINED"
147 
-        }
148 
-        "Entry"
149 
-        {
150 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
151 
-        "OwnerKey" = "8:_335D34A6BB624E7190CFE4E63CD398E8"
152 
-        "MsmSig" = "8:_UNDEFINED"
153 
-        }
154 
-        "Entry"
155 
-        {
156 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
157 
-        "OwnerKey" = "8:_EB8D0E3AFBC24F9B9845F08708803C2B"
158 
-        "MsmSig" = "8:_UNDEFINED"
159 
-        }
160 
-        "Entry"
161 
-        {
162 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
163 
-        "OwnerKey" = "8:_FEDD087CC8B64ED3A476664BC5FCAF59"
164 
-        "MsmSig" = "8:_UNDEFINED"
165 
-        }
166 
-        "Entry"
167 
-        {
168 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
169 
-        "OwnerKey" = "8:_F047B3505FC74D809FB8251423DF4095"
170 
-        "MsmSig" = "8:_UNDEFINED"
171 
-        }
172 
-        "Entry"
173 
-        {
174 
-        "MsmKey" = "8:_98634933490744AE8DEB5C5DBDC6FE40"
175 
-        "OwnerKey" = "8:_5CED7DA1BD104DA5AF2882D6CBA6E313"
176 
-        "MsmSig" = "8:_UNDEFINED"
177 
-        }
178 
-        "Entry"
179 
-        {
180 120 
         "MsmKey" = "8:_9F0AEFC1E1534D2DAA90E7632ACBD869"
181 121 
         "OwnerKey" = "8:_UNDEFINED"
182 122 
         "MsmSig" = "8:_UNDEFINED"
... ... 
@@ -219,6 +165,12 @@
219 219 
         }
220 220 
         "Entry"
221 221 
         {
222 
+        "MsmKey" = "8:_FD5044813135497E957CD988624A985F"
223 
+        "OwnerKey" = "8:_UNDEFINED"
224 
+        "MsmSig" = "8:_UNDEFINED"
225 
+        }
226 
+        "Entry"
227 
+        {
222 228 
         "MsmKey" = "8:_FEDD087CC8B64ED3A476664BC5FCAF59"
223 229 
         "OwnerKey" = "8:_UNDEFINED"
224 230 
         "MsmSig" = "8:_UNDEFINED"
... ... 
@@ -241,6 +193,14 @@
241 241 
         "PrivateKeyFile" = "8:"
242 242 
         "TimeStampServer" = "8:"
243 243 
         "InstallerBootstrapper" = "3:2"
244 
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
245 
+            {
246 
+            "Enabled" = "11:TRUE"
247 
+            "PromptEnabled" = "11:TRUE"
248 
+            "PrerequisitesLocation" = "2:1"
249 
+            "Url" = "8:"
250 
+            "ComponentsUrl" = "8:"
251 
+            }
244 252 
         }
245 253 
         "Release"
246 254 
         {
... ... 
@@ -257,6 +217,14 @@
257 257 
         "PrivateKeyFile" = "8:"
258 258 
         "TimeStampServer" = "8:"
259 259 
         "InstallerBootstrapper" = "3:2"
260 
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
261 
+            {
262 
+            "Enabled" = "11:TRUE"
263 
+            "PromptEnabled" = "11:TRUE"
264 
+            "PrerequisitesLocation" = "2:1"
265 
+            "Url" = "8:"
266 
+            "ComponentsUrl" = "8:"
267 
+            }
260 268 
         }
261 269 
     }
262 270 
     "Deployable"
... ... 
@@ -398,6 +366,26 @@
398 398 
             "IsDependency" = "11:FALSE"
399 399 
             "IsolateTo" = "8:"
400 400 
             }
401 
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65072ADBBB5441898759117DB2AC41EF"
402 
+            {
403 
+            "SourcePath" = "8:C:\\clamdeps\\win64\\openssl\\lib\\libeay32.dll"
404 
+            "TargetName" = "8:libeay32.dll"
405 
+            "Tag" = "8:"
406 
+            "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
407 
+            "Condition" = "8:"
408 
+            "Transitive" = "11:FALSE"
409 
+            "Vital" = "11:TRUE"
410 
+            "ReadOnly" = "11:FALSE"
411 
+            "Hidden" = "11:FALSE"
412 
+            "System" = "11:FALSE"
413 
+            "Permanent" = "11:FALSE"
414 
+            "SharedLegacy" = "11:FALSE"
415 
+            "PackageAs" = "3:1"
416 
+            "Register" = "3:1"
417 
+            "Exclude" = "11:FALSE"
418 
+            "IsDependency" = "11:FALSE"
419 
+            "IsolateTo" = "8:"
420 
+            }
401 421 
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_671D69A7B15349CF8AE7C0075C51AF53"
402 422 
             {
403 423 
             "SourcePath" = "8:..\\..\\COPYING.regex"
... ... 
@@ -578,6 +566,26 @@
578 578 
             "IsDependency" = "11:TRUE"
579 579 
             "IsolateTo" = "8:"
580 580 
             }
581 
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FD5044813135497E957CD988624A985F"
582 
+            {
583 
+            "SourcePath" = "8:C:\\clamdeps\\win64\\openssl\\lib\\ssleay32.dll"
584 
+            "TargetName" = "8:ssleay32.dll"
585 
+            "Tag" = "8:"
586 
+            "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
587 
+            "Condition" = "8:"
588 
+            "Transitive" = "11:FALSE"
589 
+            "Vital" = "11:TRUE"
590 
+            "ReadOnly" = "11:FALSE"
591 
+            "Hidden" = "11:FALSE"
592 
+            "System" = "11:FALSE"
593 
+            "Permanent" = "11:FALSE"
594 
+            "SharedLegacy" = "11:FALSE"
595 
+            "PackageAs" = "3:1"
596 
+            "Register" = "3:1"
597 
+            "Exclude" = "11:FALSE"
598 
+            "IsDependency" = "11:FALSE"
599 
+            "IsolateTo" = "8:"
600 
+            }
581 601 
         }
582 602 
         "FileType"
583 603 
         {
... ... 
@@ -1151,26 +1159,12 @@
1151 1151 
         }
1152 1152 
         "MergeModule"
1153 1153 
         {
1154 
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_98634933490744AE8DEB5C5DBDC6FE40"
1155 
-            {
1156 
-            "UseDynamicProperties" = "11:TRUE"
1157 
-            "IsDependency" = "11:TRUE"
1158 
-            "SourcePath" = "8:Microsoft_VC100_DebugCRT_x64.msm"
1159 
-                "Properties"
1160 
-                {
1161 
-                }
1162 
-            "LanguageId" = "3:0"
1163 
-            "Exclude" = "11:FALSE"
1164 
-            "Folder" = "8:"
1165 
-            "Feature" = "8:"
1166 
-            "IsolateTo" = "8:"
1167 
-            }
1168 1154 
         }
1169 1155 
         "ProjectOutput"
1170 1156 
         {
1171 1157 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_335D34A6BB624E7190CFE4E63CD398E8"
1172 1158 
             {
1173 
-            "SourcePath" = "8:..\\x64\\Debug\\freshclam.exe"
1159 
+            "SourcePath" = "8:..\\Win32\\Release\\freshclam.exe"
1174 1160 
             "TargetName" = "8:"
1175 1161 
             "Tag" = "8:"
1176 1162 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1198,7 +1192,7 @@
1198 1198 
             }
1199 1199 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5CED7DA1BD104DA5AF2882D6CBA6E313"
1200 1200 
             {
1201 
-            "SourcePath" = "8:..\\x64\\Debug\\clamconf.exe"
1201 
+            "SourcePath" = "8:..\\Win32\\Release\\clamconf.exe"
1202 1202 
             "TargetName" = "8:"
1203 1203 
             "Tag" = "8:"
1204 1204 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1226,7 +1220,7 @@
1226 1226 
             }
1227 1227 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_65C31C39B3E443C4B6EBE65247933F5E"
1228 1228 
             {
1229 
-            "SourcePath" = "8:..\\x64\\Debug\\sigtool.exe"
1229 
+            "SourcePath" = "8:..\\Win32\\Release\\sigtool.exe"
1230 1230 
             "TargetName" = "8:"
1231 1231 
             "Tag" = "8:"
1232 1232 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1254,7 +1248,7 @@
1254 1254 
             }
1255 1255 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_71984994A7494BE2965C585DB3EBED1F"
1256 1256 
             {
1257 
-            "SourcePath" = "8:..\\x64\\Debug\\libclamav.dll"
1257 
+            "SourcePath" = "8:..\\Win32\\Release\\libclamav.dll"
1258 1258 
             "TargetName" = "8:"
1259 1259 
             "Tag" = "8:"
1260 1260 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1282,7 +1276,7 @@
1282 1282 
             }
1283 1283 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_804379F8A48A4F7DBB50D72302559297"
1284 1284 
             {
1285 
-            "SourcePath" = "8:..\\x64\\Debug\\libclamunrar.dll"
1285 
+            "SourcePath" = "8:..\\Win32\\Release\\libclamunrar.dll"
1286 1286 
             "TargetName" = "8:"
1287 1287 
             "Tag" = "8:"
1288 1288 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1310,7 +1304,7 @@
1310 1310 
             }
1311 1311 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C0DFAFFC11514B9190D3A585C3E58832"
1312 1312 
             {
1313 
-            "SourcePath" = "8:..\\x64\\Debug\\libclamunrar_iface.dll"
1313 
+            "SourcePath" = "8:..\\Win32\\Release\\libclamunrar_iface.dll"
1314 1314 
             "TargetName" = "8:"
1315 1315 
             "Tag" = "8:"
1316 1316 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1338,7 +1332,7 @@
1338 1338 
             }
1339 1339 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DF09DF52E5014B378FBA8B4CD6C11C3B"
1340 1340 
             {
1341 
-            "SourcePath" = "8:..\\x64\\Debug\\clambc.exe"
1341 
+            "SourcePath" = "8:..\\Win32\\Release\\clambc.exe"
1342 1342 
             "TargetName" = "8:"
1343 1343 
             "Tag" = "8:"
1344 1344 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1366,7 +1360,7 @@
1366 1366 
             }
1367 1367 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EB8D0E3AFBC24F9B9845F08708803C2B"
1368 1368 
             {
1369 
-            "SourcePath" = "8:..\\x64\\Debug\\clamscan.exe"
1369 
+            "SourcePath" = "8:..\\Win32\\Release\\clamscan.exe"
1370 1370 
             "TargetName" = "8:"
1371 1371 
             "Tag" = "8:"
1372 1372 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1394,7 +1388,7 @@
1394 1394 
             }
1395 1395 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F047B3505FC74D809FB8251423DF4095"
1396 1396 
             {
1397 
-            "SourcePath" = "8:..\\x64\\Debug\\clamd.exe"
1397 
+            "SourcePath" = "8:..\\Win32\\Release\\clamd.exe"
1398 1398 
             "TargetName" = "8:"
1399 1399 
             "Tag" = "8:"
1400 1400 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
... ... 
@@ -1422,7 +1416,7 @@
1422 1422 
             }
1423 1423 
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FEDD087CC8B64ED3A476664BC5FCAF59"
1424 1424 
             {
1425 
-            "SourcePath" = "8:..\\x64\\Debug\\clamdscan.exe"
1425 
+            "SourcePath" = "8:..\\Win32\\Release\\clamdscan.exe"
1426 1426 
             "TargetName" = "8:"
1427 1427 
             "Tag" = "8:"
1428 1428 
             "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
win32/clambc.vcxproj
History View file @ 1218187
... ... 
@@ -104,13 +104,14 @@
104 104 
       <WarningLevel>Level3</WarningLevel>
105 105 
       <Optimization>Disabled</Optimization>
106 106 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
107 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108 
       <CompileAs>CompileAsC</CompileAs>
109 109 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
110 110 
     </ClCompile>
111 111 
     <Link>
112 112 
       <SubSystem>Console</SubSystem>
113 113 
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114 115 
     </Link>
115 116 
   </ItemDefinitionGroup>
116 117 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -121,7 +122,7 @@
121 121 
       <FunctionLevelLinking>true</FunctionLevelLinking>
122 122 
       <IntrinsicFunctions>true</IntrinsicFunctions>
123 123 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
124 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
125 125 
       <CompileAs>CompileAsC</CompileAs>
126 126 
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
127 127 
     </ClCompile>
... ... 
@@ -130,6 +131,7 @@
130 130 
       <GenerateDebugInformation>true</GenerateDebugInformation>
131 131 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
132 132 
       <OptimizeReferences>true</OptimizeReferences>
133 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
133 134 
     </Link>
134 135 
   </ItemDefinitionGroup>
135 136 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -140,7 +142,7 @@
140 140 
       <FunctionLevelLinking>true</FunctionLevelLinking>
141 141 
       <IntrinsicFunctions>true</IntrinsicFunctions>
142 142 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
143 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
144 144 
       <CompileAs>CompileAsC</CompileAs>
145 145 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
146 146 
     </ClCompile>
... ... 
@@ -149,6 +151,7 @@
149 149 
       <GenerateDebugInformation>true</GenerateDebugInformation>
150 150 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
151 151 
       <OptimizeReferences>true</OptimizeReferences>
152 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
152 153 
     </Link>
153 154 
   </ItemDefinitionGroup>
154 155 
   <ItemGroup>
win32/clamconf.vcxproj
History View file @ 1218187
... ... 
@@ -104,13 +104,14 @@
104 104 
       <WarningLevel>Level3</WarningLevel>
105 105 
       <Optimization>Disabled</Optimization>
106 106 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
107 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108 
       <CompileAs>CompileAsC</CompileAs>
109 109 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
110 110 
     </ClCompile>
111 111 
     <Link>
112 112 
       <SubSystem>Console</SubSystem>
113 113 
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114 115 
     </Link>
115 116 
   </ItemDefinitionGroup>
116 117 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -121,7 +122,7 @@
121 121 
       <FunctionLevelLinking>true</FunctionLevelLinking>
122 122 
       <IntrinsicFunctions>true</IntrinsicFunctions>
123 123 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
124 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
125 125 
       <CompileAs>CompileAsC</CompileAs>
126 126 
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
127 127 
     </ClCompile>
... ... 
@@ -130,6 +131,7 @@
130 130 
       <GenerateDebugInformation>true</GenerateDebugInformation>
131 131 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
132 132 
       <OptimizeReferences>true</OptimizeReferences>
133 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
133 134 
     </Link>
134 135 
   </ItemDefinitionGroup>
135 136 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -140,7 +142,7 @@
140 140 
       <FunctionLevelLinking>true</FunctionLevelLinking>
141 141 
       <IntrinsicFunctions>true</IntrinsicFunctions>
142 142 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
143 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
144 144 
       <CompileAs>CompileAsC</CompileAs>
145 145 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
146 146 
     </ClCompile>
... ... 
@@ -149,6 +151,7 @@
149 149 
       <GenerateDebugInformation>true</GenerateDebugInformation>
150 150 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
151 151 
       <OptimizeReferences>true</OptimizeReferences>
152 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
152 153 
     </Link>
153 154 
   </ItemDefinitionGroup>
154 155 
   <ItemGroup>
win32/clamd.vcxproj
History View file @ 1218187
... ... 
@@ -104,13 +104,14 @@
104 104 
       <WarningLevel>Level3</WarningLevel>
105 105 
       <Optimization>Disabled</Optimization>
106 106 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
107 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108 
       <CompileAs>CompileAsC</CompileAs>
109 109 
       <DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings>
110 110 
     </ClCompile>
111 111 
     <Link>
112 112 
       <SubSystem>Console</SubSystem>
113 113 
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114 115 
     </Link>
115 116 
   </ItemDefinitionGroup>
116 117 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -121,7 +122,7 @@
121 121 
       <FunctionLevelLinking>true</FunctionLevelLinking>
122 122 
       <IntrinsicFunctions>true</IntrinsicFunctions>
123 123 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
124 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
125 125 
       <CompileAs>CompileAsC</CompileAs>
126 126 
       <DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings>
127 127 
     </ClCompile>
... ... 
@@ -130,6 +131,7 @@
130 130 
       <GenerateDebugInformation>true</GenerateDebugInformation>
131 131 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
132 132 
       <OptimizeReferences>true</OptimizeReferences>
133 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
133 134 
     </Link>
134 135 
   </ItemDefinitionGroup>
135 136 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -140,7 +142,7 @@
140 140 
       <FunctionLevelLinking>true</FunctionLevelLinking>
141 141 
       <IntrinsicFunctions>true</IntrinsicFunctions>
142 142 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
143 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
144 144 
       <CompileAs>CompileAsC</CompileAs>
145 145 
       <DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings>
146 146 
     </ClCompile>
... ... 
@@ -149,6 +151,7 @@
149 149 
       <GenerateDebugInformation>true</GenerateDebugInformation>
150 150 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
151 151 
       <OptimizeReferences>true</OptimizeReferences>
152 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
152 153 
     </Link>
153 154 
   </ItemDefinitionGroup>
154 155 
   <ItemGroup>
win32/clamdscan.vcxproj
History View file @ 1218187
... ... 
@@ -104,13 +104,14 @@
104 104 
       <WarningLevel>Level3</WarningLevel>
105 105 
       <Optimization>Disabled</Optimization>
106 106 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
107 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108 
       <CompileAs>CompileAsC</CompileAs>
109 109 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
110 110 
     </ClCompile>
111 111 
     <Link>
112 112 
       <SubSystem>Console</SubSystem>
113 113 
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114 115 
     </Link>
115 116 
   </ItemDefinitionGroup>
116 117 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -121,7 +122,7 @@
121 121 
       <FunctionLevelLinking>true</FunctionLevelLinking>
122 122 
       <IntrinsicFunctions>true</IntrinsicFunctions>
123 123 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
124 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
125 125 
       <CompileAs>CompileAsC</CompileAs>
126 126 
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
127 127 
     </ClCompile>
... ... 
@@ -130,6 +131,7 @@
130 130 
       <GenerateDebugInformation>true</GenerateDebugInformation>
131 131 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
132 132 
       <OptimizeReferences>true</OptimizeReferences>
133 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
133 134 
     </Link>
134 135 
   </ItemDefinitionGroup>
135 136 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -140,7 +142,7 @@
140 140 
       <FunctionLevelLinking>true</FunctionLevelLinking>
141 141 
       <IntrinsicFunctions>true</IntrinsicFunctions>
142 142 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
143 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
144 144 
       <CompileAs>CompileAsC</CompileAs>
145 145 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
146 146 
     </ClCompile>
... ... 
@@ -149,6 +151,7 @@
149 149 
       <GenerateDebugInformation>true</GenerateDebugInformation>
150 150 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
151 151 
       <OptimizeReferences>true</OptimizeReferences>
152 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
152 153 
     </Link>
153 154 
   </ItemDefinitionGroup>
154 155 
   <ItemGroup>
win32/clamscan.vcxproj
History View file @ 1218187
... ... 
@@ -103,13 +103,14 @@
103 103 
       <WarningLevel>Level3</WarningLevel>
104 104 
       <Optimization>Disabled</Optimization>
105 105 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
106 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
107 107 
       <CompileAs>CompileAsC</CompileAs>
108 108 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
109 109 
     </ClCompile>
110 110 
     <Link>
111 111 
       <SubSystem>Console</SubSystem>
112 112 
       <GenerateDebugInformation>true</GenerateDebugInformation>
113 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
113 114 
     </Link>
114 115 
   </ItemDefinitionGroup>
115 116 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -120,7 +121,7 @@
120 120 
       <FunctionLevelLinking>true</FunctionLevelLinking>
121 121 
       <IntrinsicFunctions>true</IntrinsicFunctions>
122 122 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
123 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
124 124 
       <CompileAs>CompileAsC</CompileAs>
125 125 
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
126 126 
     </ClCompile>
... ... 
@@ -129,6 +130,7 @@
129 129 
       <GenerateDebugInformation>true</GenerateDebugInformation>
130 130 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
131 131 
       <OptimizeReferences>true</OptimizeReferences>
132 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
132 133 
     </Link>
133 134 
   </ItemDefinitionGroup>
134 135 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -139,7 +141,7 @@
139 139 
       <FunctionLevelLinking>true</FunctionLevelLinking>
140 140 
       <IntrinsicFunctions>true</IntrinsicFunctions>
141 141 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
142 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
143 143 
       <CompileAs>CompileAsC</CompileAs>
144 144 
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
145 145 
     </ClCompile>
... ... 
@@ -148,6 +150,7 @@
148 148 
       <GenerateDebugInformation>true</GenerateDebugInformation>
149 149 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
150 150 
       <OptimizeReferences>true</OptimizeReferences>
151 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
151 152 
     </Link>
152 153 
   </ItemDefinitionGroup>
153 154 
   <ItemGroup>
win32/freshclam.vcxproj
History View file @ 1218187
... ... 
@@ -105,7 +105,7 @@
105 105 
       <WarningLevel>Level3</WarningLevel>
106 106 
       <Optimization>Disabled</Optimization>
107 107 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
108 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
109 109 
       <CompileAs>CompileAsC</CompileAs>
110 110 
       <DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings>
111 111 
     </ClCompile>
... ... 
@@ -113,6 +113,7 @@
113 113 
       <SubSystem>Console</SubSystem>
114 114 
       <GenerateDebugInformation>true</GenerateDebugInformation>
115 115 
       <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
116 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
116 117 
     </Link>
117 118 
   </ItemDefinitionGroup>
118 119 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -123,7 +124,7 @@
123 123 
       <FunctionLevelLinking>true</FunctionLevelLinking>
124 124 
       <IntrinsicFunctions>true</IntrinsicFunctions>
125 125 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
126 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
127 127 
       <CompileAs>CompileAsC</CompileAs>
128 128 
       <DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings>
129 129 
     </ClCompile>
... ... 
@@ -133,6 +134,7 @@
133 133 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
134 134 
       <OptimizeReferences>true</OptimizeReferences>
135 135 
       <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
136 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
136 137 
     </Link>
137 138 
   </ItemDefinitionGroup>
138 139 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -143,7 +145,7 @@
143 143 
       <FunctionLevelLinking>true</FunctionLevelLinking>
144 144 
       <IntrinsicFunctions>true</IntrinsicFunctions>
145 145 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
146 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
147 147 
       <CompileAs>CompileAsC</CompileAs>
148 148 
       <DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings>
149 149 
     </ClCompile>
... ... 
@@ -153,6 +155,7 @@
153 153 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
154 154 
       <OptimizeReferences>true</OptimizeReferences>
155 155 
       <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
156 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
156 157 
     </Link>
157 158 
   </ItemDefinitionGroup>
158 159 
   <ItemGroup>
win32/libclamav.vcxproj
History View file @ 1218187
... ... 
@@ -106,7 +106,7 @@
106 106 
       <WarningLevel>Level3</WarningLevel>
107 107 
       <Optimization>Disabled</Optimization>
108 108 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109 
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..</AdditionalIncludeDirectories>
109 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
110 110 
       <CompileAs>CompileAsC</CompileAs>
111 111 
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
112 112 
     </ClCompile>
... ... 
@@ -115,6 +115,7 @@
115 115 
       <GenerateDebugInformation>true</GenerateDebugInformation>
116 116 
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
117 117 
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
118 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
118 119 
     </Link>
119 120 
   </ItemDefinitionGroup>
120 121 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -125,7 +126,7 @@
125 125 
       <FunctionLevelLinking>true</FunctionLevelLinking>
126 126 
       <IntrinsicFunctions>true</IntrinsicFunctions>
127 127 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128 
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..</AdditionalIncludeDirectories>
128 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
129 129 
       <CompileAs>CompileAsC</CompileAs>
130 130 
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
131 131 
     </ClCompile>
... ... 
@@ -136,6 +137,7 @@
136 136 
       <OptimizeReferences>true</OptimizeReferences>
137 137 
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
138 138 
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
139 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
139 140 
     </Link>
140 141 
   </ItemDefinitionGroup>
141 142 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -146,7 +148,7 @@
146 146 
       <FunctionLevelLinking>true</FunctionLevelLinking>
147 147 
       <IntrinsicFunctions>true</IntrinsicFunctions>
148 148 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149 
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..</AdditionalIncludeDirectories>
149 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
150 150 
       <CompileAs>CompileAsC</CompileAs>
151 151 
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
152 152 
     </ClCompile>
... ... 
@@ -157,6 +159,7 @@
157 157 
       <OptimizeReferences>true</OptimizeReferences>
158 158 
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
159 159 
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
160 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160 161 
     </Link>
161 162 
   </ItemDefinitionGroup>
162 163 
   <ItemGroup>
win32/libclamavcxx.vcxproj
History View file @ 1218187
... ... 
@@ -105,7 +105,7 @@
105 105 
       <WarningLevel>Level3</WarningLevel>
106 106 
       <Optimization>Disabled</Optimization>
107 107 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib"</AdditionalIncludeDirectories>
108 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
109 109 
       <CompileAs>CompileAsCpp</CompileAs>
110 110 
       <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
111 111 
     </ClCompile>
... ... 
@@ -122,7 +122,7 @@
122 122 
       <FunctionLevelLinking>true</FunctionLevelLinking>
123 123 
       <IntrinsicFunctions>true</IntrinsicFunctions>
124 124 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib"</AdditionalIncludeDirectories>
125 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126 126 
       <CompileAs>CompileAsCpp</CompileAs>
127 127 
       <DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings>
128 128 
     </ClCompile>
... ... 
@@ -141,7 +141,7 @@
141 141 
       <FunctionLevelLinking>true</FunctionLevelLinking>
142 142 
       <IntrinsicFunctions>true</IntrinsicFunctions>
143 143 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib"</AdditionalIncludeDirectories>
144 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
145 145 
       <CompileAs>CompileAsCpp</CompileAs>
146 146 
       <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
147 147 
     </ClCompile>
win32/sigtool.vcxproj
History View file @ 1218187
... ... 
@@ -104,13 +104,14 @@
104 104 
       <WarningLevel>Level3</WarningLevel>
105 105 
       <Optimization>Disabled</Optimization>
106 106 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
107 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108 
       <CompileAs>CompileAsC</CompileAs>
109 109 
       <DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings>
110 110 
     </ClCompile>
111 111 
     <Link>
112 112 
       <SubSystem>Console</SubSystem>
113 113 
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114 115 
     </Link>
115 116 
   </ItemDefinitionGroup>
116 117 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -121,7 +122,7 @@
121 121 
       <FunctionLevelLinking>true</FunctionLevelLinking>
122 122 
       <IntrinsicFunctions>true</IntrinsicFunctions>
123 123 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
124 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
125 125 
       <CompileAs>CompileAsC</CompileAs>
126 126 
       <DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings>
127 127 
     </ClCompile>
... ... 
@@ -130,6 +131,7 @@
130 130 
       <GenerateDebugInformation>true</GenerateDebugInformation>
131 131 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
132 132 
       <OptimizeReferences>true</OptimizeReferences>
133 
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
133 134 
     </Link>
134 135 
   </ItemDefinitionGroup>
135 136 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -140,7 +142,7 @@
140 140 
       <FunctionLevelLinking>true</FunctionLevelLinking>
141 141 
       <IntrinsicFunctions>true</IntrinsicFunctions>
142 142 
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143 
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
143 
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
144 144 
       <CompileAs>CompileAsC</CompileAs>
145 145 
       <DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings>
146 146 
     </ClCompile>
... ... 
@@ -149,6 +151,7 @@
149 149 
       <GenerateDebugInformation>true</GenerateDebugInformation>
150 150 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
151 151 
       <OptimizeReferences>true</OptimizeReferences>
152 
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
152 153 
     </Link>
153 154 
   </ItemDefinitionGroup>
154 155 
   <ItemGroup>
... ... 
@@ -171,7 +174,7 @@
171 171 
   <ImportGroup Label="ExtensionTargets">
172 172 
   </ImportGroup>
173 173 
   <ItemGroup>
174 
-	<Library Include="libeay32.lib" />
175 
-	<Library Include="ssleay32.lib" />
174 
+    <Library Include="libeay32.lib" />
175 
+    <Library Include="ssleay32.lib" />
176 176 
   </ItemGroup>
177 177 
 </Project>
178 178 
\ No newline at end of file