Browse code

bb11378 - updating ClamAV to support VS 2015, patch based on pull request by Keith Jones

Conflicts:
win32/libclamav.vcxproj

Mickey Sola authored on 2016/04/07 05:47:26
Showing 34 changed files
... ...
@@ -52,3 +52,10 @@ libclamav/c++/llvmunittest_VMCore
52 52
 libclamav/c++/not
53 53
 libclamav/c++/tblgen
54 54
 libclamav/c++/llvm/tools/llvmc/plugins/Base/Base.td
55
+*.lib
56
+*.pdb
57
+*.exe
58
+*.iobj
59
+*.exp
60
+*.ipdb
61
+*.dll
... ...
@@ -167,7 +167,7 @@ public:
167 167
 
168 168
     unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+
169 169
       KeyLength+1;
170
-    unsigned Alignment = alignof<StringMapEntry>();
170
+    unsigned Alignment = alignofLLVM<StringMapEntry>();
171 171
 
172 172
     StringMapEntry *NewItem =
173 173
       static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));
... ...
@@ -18,6 +18,7 @@
18 18
 #define LLVM_CODEGEN_JITCODEEMITTER_H
19 19
 
20 20
 #include <string>
21
+#include <algorithm>
21 22
 #include "llvm/System/DataTypes.h"
22 23
 #include "llvm/Support/MathExtras.h"
23 24
 #include "llvm/CodeGen/MachineCodeEmitter.h"
... ...
@@ -415,7 +415,7 @@ namespace llvm {
415 415
       IndexListEntry *entry =
416 416
         static_cast<IndexListEntry*>(
417 417
           ileAllocator.Allocate(sizeof(IndexListEntry),
418
-          alignof<IndexListEntry>()));
418
+          alignofLLVM<IndexListEntry>()));
419 419
 
420 420
       new (entry) IndexListEntry(mi, index);
421 421
 
... ...
@@ -49,12 +49,13 @@ struct AlignOf {
49 49
 
50 50
 };
51 51
 
52
+// This is a built in function in C++11.  We have to rename this.
52 53
 /// alignof - A templated function that returns the mininum alignment of
53 54
 ///  of a type.  This provides no extra functionality beyond the AlignOf
54 55
 ///  class besides some cosmetic cleanliness.  Example usage:
55 56
 ///  alignof<int>() returns the alignment of an int.
56 57
 template <typename T>
57
-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
58
+static inline unsigned alignofLLVM() { return AlignOf<T>::Alignment; }
58 59
 
59 60
 } // end namespace llvm
60 61
 #endif
... ...
@@ -201,7 +201,7 @@ public:
201 201
       char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr :
202 202
                                               (char *)Slab + Slab->Size;
203 203
       for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
204
-        Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
204
+        Ptr = Allocator.AlignPtr(Ptr, alignofLLVM<T>());
205 205
         if (Ptr + sizeof(T) <= End)
206 206
           reinterpret_cast<T*>(Ptr)->~T();
207 207
       }
... ...
@@ -11,6 +11,7 @@
11 11
 //
12 12
 //===----------------------------------------------------------------------===//
13 13
 
14
+#include <algorithm>
14 15
 #include "llvm/Support/Debug.h"
15 16
 #include "llvm/Support/FormattedStream.h"
16 17
 
... ...
@@ -100,7 +100,9 @@ static int isnan (double d) {
100 100
 
101 101
 #if defined(_MSC_VER)
102 102
 #define mkdir(p,m) _mkdir(p)
103
+#if _MSC_VER < 1900
103 104
 #define snprintf _snprintf
105
+#endif
104 106
 #if _MSC_VER < 1500
105 107
 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
106 108
 #endif
... ...
@@ -1,6 +1,8 @@
1 1
 
2
-Microsoft Visual Studio Solution File, Format Version 11.00
3
-# Visual Studio 2010
2
+Microsoft Visual Studio Solution File, Format Version 12.00
3
+# Visual Studio 14
4
+VisualStudioVersion = 14.0.24720.0
5
+MinimumVisualStudioVersion = 10.0.40219.1
4 6
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamavcxx", "libclamavcxx.vcxproj", "{3AE8051D-A188-4B11-95A4-14B8F0C290CB}"
5 7
 	ProjectSection(ProjectDependencies) = postProject
6 8
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3} = {C73EE171-635E-44AE-BED5-6D3EA981A0F3}
... ...
@@ -74,6 +76,8 @@ Global
74 74
 		Debug|x64 = Debug|x64
75 75
 		Release|Win32 = Release|Win32
76 76
 		Release|x64 = Release|x64
77
+		Release-Static|Win32 = Release-Static|Win32
78
+		Release-Static|x64 = Release-Static|x64
77 79
 	EndGlobalSection
78 80
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
79 81
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.ActiveCfg = Debug|Win32
... ...
@@ -84,6 +88,10 @@ Global
84 84
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.Build.0 = Release|Win32
85 85
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.ActiveCfg = Release|x64
86 86
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.Build.0 = Release|x64
87
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
88
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|Win32.Build.0 = Release-Static|Win32
89
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|x64.ActiveCfg = Release-Static|x64
90
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|x64.Build.0 = Release-Static|x64
87 91
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.ActiveCfg = Debug|Win32
88 92
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.Build.0 = Debug|Win32
89 93
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -92,6 +100,10 @@ Global
92 92
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.Build.0 = Release|Win32
93 93
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.ActiveCfg = Release|x64
94 94
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.Build.0 = Release|x64
95
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
96
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|Win32.Build.0 = Release-Static|Win32
97
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|x64.ActiveCfg = Release-Static|x64
98
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|x64.Build.0 = Release-Static|x64
95 99
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.ActiveCfg = Debug|Win32
96 100
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.Build.0 = Debug|Win32
97 101
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -100,6 +112,10 @@ Global
100 100
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.Build.0 = Release|Win32
101 101
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.ActiveCfg = Release|x64
102 102
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.Build.0 = Release|x64
103
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
104
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|Win32.Build.0 = Release-Static|Win32
105
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|x64.ActiveCfg = Release-Static|x64
106
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|x64.Build.0 = Release-Static|x64
103 107
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.ActiveCfg = Debug|Win32
104 108
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.Build.0 = Debug|Win32
105 109
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -108,6 +124,10 @@ Global
108 108
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.Build.0 = Release|Win32
109 109
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.ActiveCfg = Release|x64
110 110
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.Build.0 = Release|x64
111
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
112
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|Win32.Build.0 = Release-Static|Win32
113
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|x64.ActiveCfg = Release-Static|x64
114
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|x64.Build.0 = Release-Static|x64
111 115
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.ActiveCfg = Debug|Win32
112 116
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.Build.0 = Debug|Win32
113 117
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -116,6 +136,10 @@ Global
116 116
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.Build.0 = Release|Win32
117 117
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.ActiveCfg = Release|x64
118 118
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.Build.0 = Release|x64
119
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
120
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|Win32.Build.0 = Release-Static|Win32
121
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|x64.ActiveCfg = Release-Static|x64
122
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|x64.Build.0 = Release-Static|x64
119 123
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.ActiveCfg = Debug|Win32
120 124
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.Build.0 = Debug|Win32
121 125
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -124,6 +148,10 @@ Global
124 124
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.Build.0 = Release|Win32
125 125
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.ActiveCfg = Release|x64
126 126
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.Build.0 = Release|x64
127
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
128
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|Win32.Build.0 = Release-Static|Win32
129
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|x64.ActiveCfg = Release-Static|x64
130
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|x64.Build.0 = Release-Static|x64
127 131
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.ActiveCfg = Debug|Win32
128 132
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.Build.0 = Debug|Win32
129 133
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -132,6 +160,10 @@ Global
132 132
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.Build.0 = Release|Win32
133 133
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.ActiveCfg = Release|x64
134 134
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.Build.0 = Release|x64
135
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
136
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|Win32.Build.0 = Release-Static|Win32
137
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|x64.ActiveCfg = Release-Static|x64
138
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|x64.Build.0 = Release-Static|x64
135 139
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.ActiveCfg = Debug|Win32
136 140
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.Build.0 = Debug|Win32
137 141
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -140,6 +172,10 @@ Global
140 140
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.Build.0 = Release|Win32
141 141
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.ActiveCfg = Release|x64
142 142
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.Build.0 = Release|x64
143
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
144
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|Win32.Build.0 = Release-Static|Win32
145
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|x64.ActiveCfg = Release-Static|x64
146
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|x64.Build.0 = Release-Static|x64
143 147
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.ActiveCfg = Debug|Win32
144 148
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.Build.0 = Debug|Win32
145 149
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -148,6 +184,10 @@ Global
148 148
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.Build.0 = Release|Win32
149 149
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.ActiveCfg = Release|x64
150 150
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.Build.0 = Release|x64
151
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
152
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|Win32.Build.0 = Release-Static|Win32
153
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|x64.ActiveCfg = Release-Static|x64
154
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|x64.Build.0 = Release-Static|x64
151 155
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.ActiveCfg = Debug|Win32
152 156
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.Build.0 = Debug|Win32
153 157
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -156,6 +196,10 @@ Global
156 156
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.Build.0 = Release|Win32
157 157
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.ActiveCfg = Release|x64
158 158
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.Build.0 = Release|x64
159
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
160
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|Win32.Build.0 = Release-Static|Win32
161
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|x64.ActiveCfg = Release-Static|x64
162
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|x64.Build.0 = Release-Static|x64
159 163
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.ActiveCfg = Debug|Win32
160 164
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.Build.0 = Debug|Win32
161 165
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -164,6 +208,10 @@ Global
164 164
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.Build.0 = Release|Win32
165 165
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.ActiveCfg = Release|x64
166 166
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.Build.0 = Release|x64
167
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
168
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|Win32.Build.0 = Release-Static|Win32
169
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|x64.ActiveCfg = Release-Static|x64
170
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|x64.Build.0 = Release-Static|x64
167 171
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.ActiveCfg = Debug|Win32
168 172
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.Build.0 = Debug|Win32
169 173
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -172,6 +220,10 @@ Global
172 172
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.Build.0 = Release|Win32
173 173
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.ActiveCfg = Release|x64
174 174
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.Build.0 = Release|x64
175
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
176
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|Win32.Build.0 = Release-Static|Win32
177
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|x64.ActiveCfg = Release-Static|x64
178
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|x64.Build.0 = Release-Static|x64
175 179
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.ActiveCfg = Debug|Win32
176 180
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.Build.0 = Debug|Win32
177 181
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -180,6 +232,10 @@ Global
180 180
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.Build.0 = Release|Win32
181 181
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.ActiveCfg = Release|x64
182 182
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.Build.0 = Release|x64
183
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
184
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|Win32.Build.0 = Release-Static|Win32
185
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|x64.ActiveCfg = Release-Static|x64
186
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|x64.Build.0 = Release-Static|x64
183 187
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.ActiveCfg = Debug|Win32
184 188
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.Build.0 = Debug|Win32
185 189
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -188,6 +244,10 @@ Global
188 188
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.Build.0 = Release|Win32
189 189
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.ActiveCfg = Release|x64
190 190
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.Build.0 = Release|x64
191
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
192
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|Win32.Build.0 = Release-Static|Win32
193
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|x64.ActiveCfg = Release-Static|x64
194
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|x64.Build.0 = Release-Static|x64
191 195
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.ActiveCfg = Debug|Win32
192 196
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.Build.0 = Debug|Win32
193 197
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.ActiveCfg = Debug|x64
... ...
@@ -196,18 +256,26 @@ Global
196 196
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.Build.0 = Release|Win32
197 197
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.ActiveCfg = Release|x64
198 198
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.Build.0 = Release|x64
199
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
200
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|Win32.Build.0 = Release-Static|Win32
201
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|x64.ActiveCfg = Release-Static|x64
202
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|x64.Build.0 = Release-Static|x64
199 203
 		{048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|Win32.ActiveCfg = Debug
200 204
 		{048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|Win32.Build.0 = Debug
201 205
 		{048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|x64.ActiveCfg = Debug
202 206
 		{048ECA7F-4F7D-45B9-A02D-593240356556}.Release|Win32.ActiveCfg = Release
203 207
 		{048ECA7F-4F7D-45B9-A02D-593240356556}.Release|Win32.Build.0 = Release
204 208
 		{048ECA7F-4F7D-45B9-A02D-593240356556}.Release|x64.ActiveCfg = Release
209
+		{048ECA7F-4F7D-45B9-A02D-593240356556}.Release-Static|Win32.ActiveCfg = Release
210
+		{048ECA7F-4F7D-45B9-A02D-593240356556}.Release-Static|x64.ActiveCfg = Release
205 211
 		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|Win32.ActiveCfg = Debug
206 212
 		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|x64.ActiveCfg = Debug
207 213
 		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|x64.Build.0 = Debug
208 214
 		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|Win32.ActiveCfg = Release
209 215
 		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|x64.ActiveCfg = Release
210 216
 		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|x64.Build.0 = Release
217
+		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|Win32.ActiveCfg = Release
218
+		{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|x64.ActiveCfg = Release
211 219
 	EndGlobalSection
212 220
 	GlobalSection(SolutionProperties) = preSolution
213 221
 		HideSolutionNode = FALSE
... ...
@@ -1,272 +1,350 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
-  <ItemGroup Label="ProjectConfigurations">
5
-    <ProjectConfiguration Include="Debug|Win32">
6
-      <Configuration>Debug</Configuration>
7
-      <Platform>Win32</Platform>
8
-    </ProjectConfiguration>
9
-    <ProjectConfiguration Include="Debug|x64">
10
-      <Configuration>Debug</Configuration>
11
-      <Platform>x64</Platform>
12
-    </ProjectConfiguration>
13
-    <ProjectConfiguration Include="Release|Win32">
14
-      <Configuration>Release</Configuration>
15
-      <Platform>Win32</Platform>
16
-    </ProjectConfiguration>
17
-    <ProjectConfiguration Include="Release|x64">
18
-      <Configuration>Release</Configuration>
19
-      <Platform>x64</Platform>
20
-    </ProjectConfiguration>
21
-  </ItemGroup>
22
-  <ItemGroup>
23
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PeepholeOptimizer.cpp"/>
24
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Analysis.cpp"/>
25
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp"/>
26
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\TargetSelectionDAGInfo.cpp"/>
27
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\IPO\ConstantMerge.cpp"/>
28
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BuildLibCalls.cpp"/>
29
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegAllocFast.cpp"/>
30
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SplitKit.cpp"/>
31
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CallingConvLower.cpp"/>
32
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCLoggingStreamer.cpp"/>
33
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\IPO\GlobalOpt.cpp"/>
34
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LocalStackSlotAllocation.cpp"/>
35
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ScalarEvolutionNormalization.cpp"/>
36
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\Loads.cpp"/>
37
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\InlineSpiller.cpp"/>
38
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCInstPrinter.cpp"/>
39
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\SCCP.cpp"/>
40
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\LoopStrengthReduce.cpp"/>
41
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\StackSlotColoring.cpp"/>
42
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\StrongPHIElimination.cpp"/>
43
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TwoAddressInstructionPass.cpp"/>
44
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineVerifier.cpp"/>
45
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeVectorOps.cpp"/>
46
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\GCStrategy.cpp"/>
47
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveIntervalAnalysis.cpp"/>
48
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ProcessImplicitDefs.cpp"/>
49
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BasicBlockUtils.cpp"/>
50
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BreakCriticalEdges.cpp"/>
51
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LowerSubregs.cpp"/>
52
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\LoopPass.cpp"/>
53
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CriticalAntiDepBreaker.cpp"/>
54
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\TargetLowering.cpp"/>
55
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveStackAnalysis.cpp"/>
56
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LowerSwitch.cpp"/>
57
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\FastISel.cpp"/>
58
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAGPrinter.cpp"/>
59
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp"/>
60
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfoImpls.cpp"/>
61
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Spiller.cpp"/>
62
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeTypes.cpp"/>
63
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineSSAUpdater.cpp"/>
64
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\InstrEmitter.cpp"/>
65
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\Mem2Reg.cpp"/>
66
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAGISel.cpp"/>
67
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAGInstrs.cpp"/>
68
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineSink.cpp"/>
69
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PHIElimination.cpp"/>
70
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmInfoDarwin.cpp"/>
71
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\Local.cpp"/>
72
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ScalarEvolutionExpander.cpp"/>
73
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PreAllocSplitting.cpp"/>
74
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\OptimizePHIs.cpp"/>
75
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Passes.cpp"/>
76
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAGPrinter.cpp"/>
77
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LowerInvoke.cpp"/>
78
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeFloatTypes.cpp"/>
79
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp"/>
80
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\SimplifyCFG.cpp"/>
81
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegisterCoalescer.cpp"/>
82
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineLICM.cpp"/>
83
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LCSSA.cpp"/>
84
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\DemoteRegToStack.cpp"/>
85
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\UnifyFunctionExitNodes.cpp"/>
86
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeTypesGeneric.cpp"/>
87
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\FunctionLoweringInfo.cpp"/>
88
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetSubtarget.cpp"/>
89
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\GEPSplitter.cpp"/>
90
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\LoopInfo.cpp"/>
91
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LoopSimplify.cpp"/>
92
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\PHITransAddr.cpp"/>
93
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\PromoteMemoryToRegister.cpp"/>
94
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachinePassRegistry.cpp"/>
95
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAGEmit.cpp"/>
96
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCNullStreamer.cpp"/>
97
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAG.cpp"/>
98
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\StackProtector.cpp"/>
99
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\InstructionSimplify.cpp"/>
100
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LLVMTargetMachine.cpp"/>
101
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAGBuilder.cpp"/>
102
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\DAGCombiner.cpp"/>
103
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PostRASchedulerList.cpp"/>
104
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TargetLoweringObjectFileImpl.cpp"/>
105
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TailDuplication.cpp"/>
106
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveInterval.cpp"/>
107
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmStreamer.cpp"/>
108
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeVectorTypes.cpp"/>
109
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SjLjEHPrepare.cpp"/>
110
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ShrinkWrapping.cpp"/>
111
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AggressiveAntiDepBreaker.cpp"/>
112
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CodePlacementOpt.cpp"/>
113
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\SSAUpdater.cpp"/>
114
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\GCMetadata.cpp"/>
115
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SimpleRegisterCoalescing.cpp"/>
116
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ScalarEvolution.cpp"/>
117
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\DeadMachineInstructionElim.cpp"/>
118
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ConstantFolding.cpp"/>
119
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodes.cpp"/>
120
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeDAG.cpp"/>
121
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LatencyPriorityQueue.cpp"/>
122
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\BranchFolding.cpp"/>
123
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCStreamer.cpp"/>
124
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetFrameInfo.cpp"/>
125
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\GVN.cpp"/>
126
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\DwarfEHPrepare.cpp"/>
127
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\MemoryDependenceAnalysis.cpp"/>
128
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CalcSpillWeights.cpp"/>
129
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegisterScavenging.cpp"/>
130
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeIntegerTypes.cpp"/>
131
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegAllocLinearScan.cpp"/>
132
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SlotIndexes.cpp"/>
133
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\VirtRegMap.cpp"/>
134
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\CodeGenPrepare.cpp"/>
135
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\VirtRegRewriter.cpp"/>
136
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PrologEpilogInserter.cpp"/>
137
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\IVUsers.cpp"/>
138
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineCSE.cpp"/>
139
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\AddrModeMatcher.cpp"/>
140
-  </ItemGroup>
141
-  <PropertyGroup Label="Globals">
142
-    <ProjectGuid>{40088299-8C66-4565-A3BD-9DBF5E1A1681}</ProjectGuid>
143
-    <Keyword>Win32Proj</Keyword>
144
-    <RootNamespace>LLVMcodegen</RootNamespace>
145
-  </PropertyGroup>
146
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
147
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
148
-    <ConfigurationType>StaticLibrary</ConfigurationType>
149
-    <UseDebugLibraries>true</UseDebugLibraries>
150
-    <CharacterSet>MultiByte</CharacterSet>
151
-  </PropertyGroup>
152
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
153
-    <ConfigurationType>StaticLibrary</ConfigurationType>
154
-    <UseDebugLibraries>true</UseDebugLibraries>
155
-    <CharacterSet>MultiByte</CharacterSet>
156
-  </PropertyGroup>
157
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
158
-    <ConfigurationType>StaticLibrary</ConfigurationType>
159
-    <UseDebugLibraries>false</UseDebugLibraries>
160
-    <WholeProgramOptimization>true</WholeProgramOptimization>
161
-    <CharacterSet>MultiByte</CharacterSet>
162
-  </PropertyGroup>
163
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
164
-    <ConfigurationType>StaticLibrary</ConfigurationType>
165
-    <UseDebugLibraries>false</UseDebugLibraries>
166
-    <WholeProgramOptimization>true</WholeProgramOptimization>
167
-    <CharacterSet>MultiByte</CharacterSet>
168
-  </PropertyGroup>
169
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
170
-  <ImportGroup Label="ExtensionSettings">
171
-  </ImportGroup>
172
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
173
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
174
-  </ImportGroup>
175
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
176
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
177
-  </ImportGroup>
178
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
179
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
180
-  </ImportGroup>
181
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
182
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
183
-  </ImportGroup>
184
-  <PropertyGroup Label="UserMacros"/>
185
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
186
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
187
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
188
-  </PropertyGroup>
189
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
190
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
191
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
192
-  </PropertyGroup>
193
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
194
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
195
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
196
-  </PropertyGroup>
197
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
198
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
199
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
200
-  </PropertyGroup>
201
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
202
-    <ClCompile>
203
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
204
-      <WarningLevel>Level3</WarningLevel>
205
-      <Optimization>Disabled</Optimization>
206
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
207
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
208
-      <CompileAs>CompileAsCpp</CompileAs>
209
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
210
-    </ClCompile>
211
-    <Link>
212
-      <SubSystem>Windows</SubSystem>
213
-      <GenerateDebugInformation>true</GenerateDebugInformation>
214
-    </Link>
215
-  </ItemDefinitionGroup>
216
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
217
-    <ClCompile>
218
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
219
-      <WarningLevel>Level3</WarningLevel>
220
-      <Optimization>Disabled</Optimization>
221
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
222
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
223
-      <CompileAs>CompileAsCpp</CompileAs>
224
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
225
-    </ClCompile>
226
-    <Link>
227
-      <SubSystem>Windows</SubSystem>
228
-      <GenerateDebugInformation>true</GenerateDebugInformation>
229
-    </Link>
230
-  </ItemDefinitionGroup>
231
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
232
-    <ClCompile>
233
-      <WarningLevel>Level3</WarningLevel>
234
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
235
-      <Optimization>MaxSpeed</Optimization>
236
-      <FunctionLevelLinking>true</FunctionLevelLinking>
237
-      <IntrinsicFunctions>true</IntrinsicFunctions>
238
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
239
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
240
-      <CompileAs>CompileAsCpp</CompileAs>
241
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
242
-    </ClCompile>
243
-    <Link>
244
-      <SubSystem>Windows</SubSystem>
245
-      <GenerateDebugInformation>true</GenerateDebugInformation>
246
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
247
-      <OptimizeReferences>true</OptimizeReferences>
248
-    </Link>
249
-  </ItemDefinitionGroup>
250
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
251
-    <ClCompile>
252
-      <WarningLevel>Level3</WarningLevel>
253
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
254
-      <Optimization>MaxSpeed</Optimization>
255
-      <FunctionLevelLinking>true</FunctionLevelLinking>
256
-      <IntrinsicFunctions>true</IntrinsicFunctions>
257
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
258
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
259
-      <CompileAs>CompileAsCpp</CompileAs>
260
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
261
-    </ClCompile>
262
-    <Link>
263
-      <SubSystem>Windows</SubSystem>
264
-      <GenerateDebugInformation>true</GenerateDebugInformation>
265
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
266
-      <OptimizeReferences>true</OptimizeReferences>
267
-    </Link>
268
-  </ItemDefinitionGroup>
269
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
270
-  <ImportGroup Label="ExtensionTargets">
271
-  </ImportGroup>
272
-</Project>
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ItemGroup Label="ProjectConfigurations">
4
+    <ProjectConfiguration Include="Debug|Win32">
5
+      <Configuration>Debug</Configuration>
6
+      <Platform>Win32</Platform>
7
+    </ProjectConfiguration>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
11
+    </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
20
+    <ProjectConfiguration Include="Release|Win32">
21
+      <Configuration>Release</Configuration>
22
+      <Platform>Win32</Platform>
23
+    </ProjectConfiguration>
24
+    <ProjectConfiguration Include="Release|x64">
25
+      <Configuration>Release</Configuration>
26
+      <Platform>x64</Platform>
27
+    </ProjectConfiguration>
28
+  </ItemGroup>
29
+  <ItemGroup>
30
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PeepholeOptimizer.cpp" />
31
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Analysis.cpp" />
32
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp" />
33
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\TargetSelectionDAGInfo.cpp" />
34
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\IPO\ConstantMerge.cpp" />
35
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BuildLibCalls.cpp" />
36
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegAllocFast.cpp" />
37
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SplitKit.cpp" />
38
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CallingConvLower.cpp" />
39
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCLoggingStreamer.cpp" />
40
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\IPO\GlobalOpt.cpp" />
41
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LocalStackSlotAllocation.cpp" />
42
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ScalarEvolutionNormalization.cpp" />
43
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\Loads.cpp" />
44
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\InlineSpiller.cpp" />
45
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCInstPrinter.cpp" />
46
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\SCCP.cpp" />
47
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\LoopStrengthReduce.cpp" />
48
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\StackSlotColoring.cpp" />
49
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\StrongPHIElimination.cpp" />
50
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TwoAddressInstructionPass.cpp" />
51
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineVerifier.cpp" />
52
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeVectorOps.cpp" />
53
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\GCStrategy.cpp" />
54
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveIntervalAnalysis.cpp" />
55
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ProcessImplicitDefs.cpp" />
56
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BasicBlockUtils.cpp" />
57
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BreakCriticalEdges.cpp" />
58
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LowerSubregs.cpp" />
59
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\LoopPass.cpp" />
60
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CriticalAntiDepBreaker.cpp" />
61
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\TargetLowering.cpp" />
62
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveStackAnalysis.cpp" />
63
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LowerSwitch.cpp" />
64
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\FastISel.cpp" />
65
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAGPrinter.cpp" />
66
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp" />
67
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfoImpls.cpp" />
68
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Spiller.cpp" />
69
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeTypes.cpp" />
70
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineSSAUpdater.cpp" />
71
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\InstrEmitter.cpp" />
72
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\Mem2Reg.cpp" />
73
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAGISel.cpp" />
74
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAGInstrs.cpp" />
75
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineSink.cpp" />
76
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PHIElimination.cpp" />
77
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmInfoDarwin.cpp" />
78
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\Local.cpp" />
79
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ScalarEvolutionExpander.cpp" />
80
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PreAllocSplitting.cpp" />
81
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\OptimizePHIs.cpp" />
82
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Passes.cpp" />
83
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAGPrinter.cpp" />
84
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LowerInvoke.cpp" />
85
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeFloatTypes.cpp" />
86
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp" />
87
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\SimplifyCFG.cpp" />
88
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegisterCoalescer.cpp" />
89
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineLICM.cpp" />
90
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LCSSA.cpp" />
91
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\DemoteRegToStack.cpp" />
92
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\UnifyFunctionExitNodes.cpp" />
93
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeTypesGeneric.cpp" />
94
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\FunctionLoweringInfo.cpp" />
95
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetSubtarget.cpp" />
96
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\GEPSplitter.cpp" />
97
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\LoopInfo.cpp" />
98
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\LoopSimplify.cpp" />
99
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\PHITransAddr.cpp" />
100
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\PromoteMemoryToRegister.cpp" />
101
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachinePassRegistry.cpp" />
102
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAGEmit.cpp" />
103
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCNullStreamer.cpp" />
104
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAG.cpp" />
105
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\StackProtector.cpp" />
106
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\InstructionSimplify.cpp" />
107
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LLVMTargetMachine.cpp" />
108
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\SelectionDAGBuilder.cpp" />
109
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\DAGCombiner.cpp" />
110
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PostRASchedulerList.cpp" />
111
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TargetLoweringObjectFileImpl.cpp" />
112
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TailDuplication.cpp" />
113
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveInterval.cpp" />
114
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmStreamer.cpp" />
115
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeVectorTypes.cpp" />
116
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SjLjEHPrepare.cpp" />
117
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ShrinkWrapping.cpp" />
118
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AggressiveAntiDepBreaker.cpp" />
119
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CodePlacementOpt.cpp" />
120
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\SSAUpdater.cpp" />
121
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\GCMetadata.cpp" />
122
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SimpleRegisterCoalescing.cpp" />
123
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ScalarEvolution.cpp" />
124
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\DeadMachineInstructionElim.cpp" />
125
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ConstantFolding.cpp" />
126
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodes.cpp" />
127
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeDAG.cpp" />
128
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LatencyPriorityQueue.cpp" />
129
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\BranchFolding.cpp" />
130
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCStreamer.cpp" />
131
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetFrameInfo.cpp" />
132
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\GVN.cpp" />
133
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\DwarfEHPrepare.cpp" />
134
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\MemoryDependenceAnalysis.cpp" />
135
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CalcSpillWeights.cpp" />
136
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegisterScavenging.cpp" />
137
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeIntegerTypes.cpp" />
138
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegAllocLinearScan.cpp" />
139
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SlotIndexes.cpp" />
140
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\VirtRegMap.cpp" />
141
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\CodeGenPrepare.cpp" />
142
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\VirtRegRewriter.cpp" />
143
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PrologEpilogInserter.cpp" />
144
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\IVUsers.cpp" />
145
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineCSE.cpp" />
146
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\AddrModeMatcher.cpp" />
147
+  </ItemGroup>
148
+  <PropertyGroup Label="Globals">
149
+    <ProjectGuid>{40088299-8C66-4565-A3BD-9DBF5E1A1681}</ProjectGuid>
150
+    <Keyword>Win32Proj</Keyword>
151
+    <RootNamespace>LLVMcodegen</RootNamespace>
152
+  </PropertyGroup>
153
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
154
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
155
+    <ConfigurationType>StaticLibrary</ConfigurationType>
156
+    <UseDebugLibraries>true</UseDebugLibraries>
157
+    <CharacterSet>MultiByte</CharacterSet>
158
+    <PlatformToolset>v140</PlatformToolset>
159
+  </PropertyGroup>
160
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
161
+    <ConfigurationType>StaticLibrary</ConfigurationType>
162
+    <UseDebugLibraries>true</UseDebugLibraries>
163
+    <CharacterSet>MultiByte</CharacterSet>
164
+    <PlatformToolset>v140</PlatformToolset>
165
+  </PropertyGroup>
166
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
167
+    <ConfigurationType>StaticLibrary</ConfigurationType>
168
+    <UseDebugLibraries>false</UseDebugLibraries>
169
+    <WholeProgramOptimization>true</WholeProgramOptimization>
170
+    <CharacterSet>MultiByte</CharacterSet>
171
+    <PlatformToolset>v140</PlatformToolset>
172
+  </PropertyGroup>
173
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
174
+    <ConfigurationType>StaticLibrary</ConfigurationType>
175
+    <UseDebugLibraries>false</UseDebugLibraries>
176
+    <WholeProgramOptimization>true</WholeProgramOptimization>
177
+    <CharacterSet>MultiByte</CharacterSet>
178
+    <PlatformToolset>v140</PlatformToolset>
179
+  </PropertyGroup>
180
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
181
+    <ConfigurationType>StaticLibrary</ConfigurationType>
182
+    <UseDebugLibraries>false</UseDebugLibraries>
183
+    <WholeProgramOptimization>true</WholeProgramOptimization>
184
+    <CharacterSet>MultiByte</CharacterSet>
185
+    <PlatformToolset>v140</PlatformToolset>
186
+  </PropertyGroup>
187
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
188
+    <ConfigurationType>StaticLibrary</ConfigurationType>
189
+    <UseDebugLibraries>false</UseDebugLibraries>
190
+    <WholeProgramOptimization>true</WholeProgramOptimization>
191
+    <CharacterSet>MultiByte</CharacterSet>
192
+    <PlatformToolset>v140</PlatformToolset>
193
+  </PropertyGroup>
194
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
195
+  <ImportGroup Label="ExtensionSettings">
196
+  </ImportGroup>
197
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
198
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
199
+  </ImportGroup>
200
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
201
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
202
+  </ImportGroup>
203
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
204
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
205
+  </ImportGroup>
206
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
207
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
208
+  </ImportGroup>
209
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
210
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
211
+  </ImportGroup>
212
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
213
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
214
+  </ImportGroup>
215
+  <PropertyGroup Label="UserMacros" />
216
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
217
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
218
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
219
+  </PropertyGroup>
220
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
221
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
222
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
223
+  </PropertyGroup>
224
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
225
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
226
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
227
+  </PropertyGroup>
228
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
229
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
230
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
231
+  </PropertyGroup>
232
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
233
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
234
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
235
+  </PropertyGroup>
236
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
237
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
238
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
239
+  </PropertyGroup>
240
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
241
+    <ClCompile>
242
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
243
+      <WarningLevel>Level3</WarningLevel>
244
+      <Optimization>Disabled</Optimization>
245
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
246
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
247
+      <CompileAs>CompileAsCpp</CompileAs>
248
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
249
+    </ClCompile>
250
+    <Link>
251
+      <SubSystem>Windows</SubSystem>
252
+      <GenerateDebugInformation>true</GenerateDebugInformation>
253
+    </Link>
254
+  </ItemDefinitionGroup>
255
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
256
+    <ClCompile>
257
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
258
+      <WarningLevel>Level3</WarningLevel>
259
+      <Optimization>Disabled</Optimization>
260
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
261
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
262
+      <CompileAs>CompileAsCpp</CompileAs>
263
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
264
+    </ClCompile>
265
+    <Link>
266
+      <SubSystem>Windows</SubSystem>
267
+      <GenerateDebugInformation>true</GenerateDebugInformation>
268
+    </Link>
269
+  </ItemDefinitionGroup>
270
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
271
+    <ClCompile>
272
+      <WarningLevel>Level3</WarningLevel>
273
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
274
+      <Optimization>MaxSpeed</Optimization>
275
+      <FunctionLevelLinking>true</FunctionLevelLinking>
276
+      <IntrinsicFunctions>true</IntrinsicFunctions>
277
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
278
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
279
+      <CompileAs>CompileAsCpp</CompileAs>
280
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
281
+    </ClCompile>
282
+    <Link>
283
+      <SubSystem>Windows</SubSystem>
284
+      <GenerateDebugInformation>true</GenerateDebugInformation>
285
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
286
+      <OptimizeReferences>true</OptimizeReferences>
287
+    </Link>
288
+  </ItemDefinitionGroup>
289
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
290
+    <ClCompile>
291
+      <WarningLevel>Level3</WarningLevel>
292
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
293
+      <Optimization>MaxSpeed</Optimization>
294
+      <FunctionLevelLinking>true</FunctionLevelLinking>
295
+      <IntrinsicFunctions>true</IntrinsicFunctions>
296
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
297
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
298
+      <CompileAs>CompileAsCpp</CompileAs>
299
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
300
+    </ClCompile>
301
+    <Link>
302
+      <SubSystem>Windows</SubSystem>
303
+      <GenerateDebugInformation>true</GenerateDebugInformation>
304
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
305
+      <OptimizeReferences>true</OptimizeReferences>
306
+    </Link>
307
+  </ItemDefinitionGroup>
308
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
309
+    <ClCompile>
310
+      <WarningLevel>Level3</WarningLevel>
311
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
312
+      <Optimization>MaxSpeed</Optimization>
313
+      <FunctionLevelLinking>true</FunctionLevelLinking>
314
+      <IntrinsicFunctions>true</IntrinsicFunctions>
315
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
316
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
317
+      <CompileAs>CompileAsCpp</CompileAs>
318
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
319
+    </ClCompile>
320
+    <Link>
321
+      <SubSystem>Windows</SubSystem>
322
+      <GenerateDebugInformation>true</GenerateDebugInformation>
323
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
324
+      <OptimizeReferences>true</OptimizeReferences>
325
+    </Link>
326
+  </ItemDefinitionGroup>
327
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
328
+    <ClCompile>
329
+      <WarningLevel>Level3</WarningLevel>
330
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
331
+      <Optimization>MaxSpeed</Optimization>
332
+      <FunctionLevelLinking>true</FunctionLevelLinking>
333
+      <IntrinsicFunctions>true</IntrinsicFunctions>
334
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
335
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
336
+      <CompileAs>CompileAsCpp</CompileAs>
337
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
338
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
339
+    </ClCompile>
340
+    <Link>
341
+      <SubSystem>Windows</SubSystem>
342
+      <GenerateDebugInformation>true</GenerateDebugInformation>
343
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
344
+      <OptimizeReferences>true</OptimizeReferences>
345
+    </Link>
346
+  </ItemDefinitionGroup>
347
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
348
+  <ImportGroup Label="ExtensionTargets">
349
+  </ImportGroup>
350
+</Project>
273 351
\ No newline at end of file
... ...
@@ -10,9 +10,6 @@
10 10
     <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\AddrModeMatcher.cpp">
11 11
       <Filter>Source Files</Filter>
12 12
     </ClCompile>
13
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveVariables.cpp">
14
-      <Filter>Source Files</Filter>
15
-    </ClCompile>
16 13
     <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\LoopStrengthReduce.cpp">
17 14
       <Filter>Source Files</Filter>
18 15
     </ClCompile>
... ...
@@ -40,9 +37,6 @@
40 40
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ProcessImplicitDefs.cpp">
41 41
       <Filter>Source Files</Filter>
42 42
     </ClCompile>
43
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp">
44
-      <Filter>Source Files</Filter>
45
-    </ClCompile>
46 43
     <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BasicBlockUtils.cpp">
47 44
       <Filter>Source Files</Filter>
48 45
     </ClCompile>
... ...
@@ -82,27 +76,15 @@
82 82
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Spiller.cpp">
83 83
       <Filter>Source Files</Filter>
84 84
     </ClCompile>
85
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ProfileInfo.cpp">
86
-      <Filter>Source Files</Filter>
87
-    </ClCompile>
88 85
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeTypes.cpp">
89 86
       <Filter>Source Files</Filter>
90 87
     </ClCompile>
91
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGFast.cpp">
92
-      <Filter>Source Files</Filter>
93
-    </ClCompile>
94
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AsmPrinter\DIE.cpp">
95
-      <Filter>Source Files</Filter>
96
-    </ClCompile>
97 88
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineSSAUpdater.cpp">
98 89
       <Filter>Source Files</Filter>
99 90
     </ClCompile>
100 91
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\InstrEmitter.cpp">
101 92
       <Filter>Source Files</Filter>
102 93
     </ClCompile>
103
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAssembler.cpp">
104
-      <Filter>Source Files</Filter>
105
-    </ClCompile>
106 94
     <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\Mem2Reg.cpp">
107 95
       <Filter>Source Files</Filter>
108 96
     </ClCompile>
... ...
@@ -112,15 +94,9 @@
112 112
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAGInstrs.cpp">
113 113
       <Filter>Source Files</Filter>
114 114
     </ClCompile>
115
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AsmPrinter\DwarfLabel.cpp">
116
-      <Filter>Source Files</Filter>
117
-    </ClCompile>
118 115
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineSink.cpp">
119 116
       <Filter>Source Files</Filter>
120 117
     </ClCompile>
121
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineLoopInfo.cpp">
122
-      <Filter>Source Files</Filter>
123
-    </ClCompile>
124 118
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PHIElimination.cpp">
125 119
       <Filter>Source Files</Filter>
126 120
     </ClCompile>
... ...
@@ -172,12 +148,6 @@
172 172
     <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\UnifyFunctionExitNodes.cpp">
173 173
       <Filter>Source Files</Filter>
174 174
     </ClCompile>
175
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AsmPrinter\AsmPrinter.cpp">
176
-      <Filter>Source Files</Filter>
177
-    </ClCompile>
178
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\CallingConvLower.cpp">
179
-      <Filter>Source Files</Filter>
180
-    </ClCompile>
181 175
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeTypesGeneric.cpp">
182 176
       <Filter>Source Files</Filter>
183 177
     </ClCompile>
... ...
@@ -202,9 +172,6 @@
202 202
     <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\PromoteMemoryToRegister.cpp">
203 203
       <Filter>Source Files</Filter>
204 204
     </ClCompile>
205
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AsmPrinter\DwarfException.cpp">
206
-      <Filter>Source Files</Filter>
207
-    </ClCompile>
208 205
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachinePassRegistry.cpp">
209 206
       <Filter>Source Files</Filter>
210 207
     </ClCompile>
... ...
@@ -247,9 +214,6 @@
247 247
     <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmStreamer.cpp">
248 248
       <Filter>Source Files</Filter>
249 249
     </ClCompile>
250
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AsmPrinter\DwarfDebug.cpp">
251
-      <Filter>Source Files</Filter>
252
-    </ClCompile>
253 250
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeVectorTypes.cpp">
254 251
       <Filter>Source Files</Filter>
255 252
     </ClCompile>
... ...
@@ -268,9 +232,6 @@
268 268
     <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\SSAUpdater.cpp">
269 269
       <Filter>Source Files</Filter>
270 270
     </ClCompile>
271
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ExactHazardRecognizer.cpp">
272
-      <Filter>Source Files</Filter>
273
-    </ClCompile>
274 271
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\GCMetadata.cpp">
275 272
       <Filter>Source Files</Filter>
276 273
     </ClCompile>
... ...
@@ -286,27 +247,9 @@
286 286
     <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ConstantFolding.cpp">
287 287
       <Filter>Source Files</Filter>
288 288
     </ClCompile>
289
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\AliasSetTracker.cpp">
290
-      <Filter>Source Files</Filter>
291
-    </ClCompile>
292 289
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodes.cpp">
293 290
       <Filter>Source Files</Filter>
294 291
     </ClCompile>
295
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp">
296
-      <Filter>Source Files</Filter>
297
-    </ClCompile>
298
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAG.cpp">
299
-      <Filter>Source Files</Filter>
300
-    </ClCompile>
301
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\OptimizeExts.cpp">
302
-      <Filter>Source Files</Filter>
303
-    </ClCompile>
304
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\UnreachableBlockElim.cpp">
305
-      <Filter>Source Files</Filter>
306
-    </ClCompile>
307
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AsmPrinter\DwarfWriter.cpp">
308
-      <Filter>Source Files</Filter>
309
-    </ClCompile>
310 292
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\LegalizeDAG.cpp">
311 293
       <Filter>Source Files</Filter>
312 294
     </ClCompile>
... ...
@@ -361,16 +304,58 @@
361 361
     <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\IVUsers.cpp">
362 362
       <Filter>Source Files</Filter>
363 363
     </ClCompile>
364
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCInst.cpp">
364
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineCSE.cpp">
365 365
       <Filter>Source Files</Filter>
366 366
     </ClCompile>
367
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\AsmPrinter\DwarfPrinter.cpp">
367
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PeepholeOptimizer.cpp">
368 368
       <Filter>Source Files</Filter>
369 369
     </ClCompile>
370
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineCSE.cpp">
370
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\Analysis.cpp">
371
+      <Filter>Source Files</Filter>
372
+    </ClCompile>
373
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp">
374
+      <Filter>Source Files</Filter>
375
+    </ClCompile>
376
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SelectionDAG\TargetSelectionDAGInfo.cpp">
377
+      <Filter>Source Files</Filter>
378
+    </ClCompile>
379
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\IPO\ConstantMerge.cpp">
380
+      <Filter>Source Files</Filter>
381
+    </ClCompile>
382
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Utils\BuildLibCalls.cpp">
383
+      <Filter>Source Files</Filter>
384
+    </ClCompile>
385
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\RegAllocFast.cpp">
386
+      <Filter>Source Files</Filter>
387
+    </ClCompile>
388
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\SplitKit.cpp">
389
+      <Filter>Source Files</Filter>
390
+    </ClCompile>
391
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\CallingConvLower.cpp">
392
+      <Filter>Source Files</Filter>
393
+    </ClCompile>
394
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCLoggingStreamer.cpp">
395
+      <Filter>Source Files</Filter>
396
+    </ClCompile>
397
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\IPO\GlobalOpt.cpp">
398
+      <Filter>Source Files</Filter>
399
+    </ClCompile>
400
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LocalStackSlotAllocation.cpp">
401
+      <Filter>Source Files</Filter>
402
+    </ClCompile>
403
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ScalarEvolutionNormalization.cpp">
404
+      <Filter>Source Files</Filter>
405
+    </ClCompile>
406
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\Loads.cpp">
407
+      <Filter>Source Files</Filter>
408
+    </ClCompile>
409
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\InlineSpiller.cpp">
410
+      <Filter>Source Files</Filter>
411
+    </ClCompile>
412
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCInstPrinter.cpp">
371 413
       <Filter>Source Files</Filter>
372 414
     </ClCompile>
373
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineDominators.cpp">
415
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\SCCP.cpp">
374 416
       <Filter>Source Files</Filter>
375 417
     </ClCompile>
376 418
   </ItemGroup>
... ...
@@ -1,272 +1,350 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
-  <ItemGroup Label="ProjectConfigurations">
5
-    <ProjectConfiguration Include="Debug|Win32">
6
-      <Configuration>Debug</Configuration>
7
-      <Platform>Win32</Platform>
8
-    </ProjectConfiguration>
9
-    <ProjectConfiguration Include="Debug|x64">
10
-      <Configuration>Debug</Configuration>
11
-      <Platform>x64</Platform>
12
-    </ProjectConfiguration>
13
-    <ProjectConfiguration Include="Release|Win32">
14
-      <Configuration>Release</Configuration>
15
-      <Platform>Win32</Platform>
16
-    </ProjectConfiguration>
17
-    <ProjectConfiguration Include="Release|x64">
18
-      <Configuration>Release</Configuration>
19
-      <Platform>x64</Platform>
20
-    </ProjectConfiguration>
21
-  </ItemGroup>
22
-  <ItemGroup>
23
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveVariables.cpp"/>
24
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPrinterPass.cpp"/>
25
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ProfileInfo.cpp"/>
26
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAssembler.cpp"/>
27
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineLoopInfo.cpp"/>
28
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\DebugLoc.cpp"/>
29
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PostRAHazardRecognizer.cpp"/>
30
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\AliasSetTracker.cpp"/>
31
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp"/>
32
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAG.cpp"/>
33
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\UnreachableBlockElim.cpp"/>
34
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\PassRegistry.cpp"/>
35
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCInst.cpp"/>
36
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionCOFF.cpp"/>
37
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineDominators.cpp"/>
38
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JIT.cpp"/>
39
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunction.cpp"/>
40
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\SmallVector.cpp"/>
41
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSymbol.cpp"/>
42
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\SimplifyCFGPass.cpp"/>
43
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\IRBuilder.cpp"/>
44
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp"/>
45
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Triple.cpp"/>
46
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Instruction.cpp"/>
47
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Value.cpp"/>
48
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\ValueTypes.cpp"/>
49
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\SourceMgr.cpp"/>
50
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\IntrinsicInst.cpp"/>
51
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\PointerTracking.cpp"/>
52
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\ExecutionEngine.cpp"/>
53
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITMemoryManager.cpp"/>
54
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\APInt.cpp"/>
55
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetLoweringObjectFile.cpp"/>
56
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\IPA\CallGraph.cpp"/>
57
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\LLVMContext.cpp"/>
58
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\ConstantRange.cpp"/>
59
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Globals.cpp"/>
60
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSection.cpp"/>
61
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\ValueSymbolTable.cpp"/>
62
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\CaptureTracking.cpp"/>
63
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Function.cpp"/>
64
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITEmitter.cpp"/>
65
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\TargetSelect.cpp"/>
66
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Use.cpp"/>
67
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\SubtargetFeature.cpp"/>
68
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\ManagedStatic.cpp"/>
69
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\LLVMContextImpl.cpp"/>
70
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Statistic.cpp"/>
71
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetInstrInfo.cpp"/>
72
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Metadata.cpp"/>
73
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ObjectCodeEmitter.cpp"/>
74
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringExtras.cpp"/>
75
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineInstr.cpp"/>
76
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Pass.cpp"/>
77
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\CommandLine.cpp"/>
78
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\PassManager.cpp"/>
79
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\AutoUpgrade.cpp"/>
80
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionAnalysis.cpp"/>
81
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Allocator.cpp"/>
82
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringMap.cpp"/>
83
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCContext.cpp"/>
84
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Attributes.cpp"/>
85
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ValueTracking.cpp"/>
86
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\GVMaterializer.cpp"/>
87
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\MemoryBuiltins.cpp"/>
88
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\APFloat.cpp"/>
89
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\ConstantFold.cpp"/>
90
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCExpr.cpp"/>
91
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetMachine.cpp"/>
92
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\InlineAsm.cpp"/>
93
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\circular_raw_ostream.cpp"/>
94
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TargetInstrInfoImpl.cpp"/>
95
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Debug.cpp"/>
96
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\Mangler.cpp"/>
97
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\DCE.cpp"/>
98
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PseudoSourceValue.cpp"/>
99
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\TargetRegistry.cpp"/>
100
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Verifier.cpp"/>
101
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\LeakDetector.cpp"/>
102
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringPool.cpp"/>
103
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetData.cpp"/>
104
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDwarfEmitter.cpp"/>
105
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Dominators.cpp"/>
106
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\DebugInfo.cpp"/>
107
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmInfo.cpp"/>
108
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Dwarf.cpp"/>
109
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineBasicBlock.cpp"/>
110
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Type.cpp"/>
111
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ELFWriter.cpp"/>
112
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\PrintModulePass.cpp"/>
113
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Module.cpp"/>
114
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ELFCodeEmitter.cpp"/>
115
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\BasicBlock.cpp"/>
116
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Timer.cpp"/>
117
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDebugRegisterer.cpp"/>
118
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\FoldingSet.cpp"/>
119
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\SmallPtrSet.cpp"/>
120
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\BasicAliasAnalysis.cpp"/>
121
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\MemoryBuffer.cpp"/>
122
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Instructions.cpp"/>
123
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineRegisterInfo.cpp"/>
124
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\OProfileJITEventListener.cpp"/>
125
-    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\Intercept.cpp"/>
126
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetRegisterInfo.cpp"/>
127
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\FormattedStream.cpp"/>
128
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Constants.cpp"/>
129
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\raw_ostream.cpp"/>
130
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Core.cpp"/>
131
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\ErrorHandling.cpp"/>
132
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPass.cpp"/>
133
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionELF.cpp"/>
134
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Twine.cpp"/>
135
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\AsmWriter.cpp"/>
136
-    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\TypeSymbolTable.cpp"/>
137
-    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfo.cpp"/>
138
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringRef.cpp"/>
139
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\AliasAnalysis.cpp"/>
140
-  </ItemGroup>
141
-  <PropertyGroup Label="Globals">
142
-    <ProjectGuid>{C73EE171-635E-44AE-BED5-6D3EA981A0F3}</ProjectGuid>
143
-    <Keyword>Win32Proj</Keyword>
144
-    <RootNamespace>LLVMjit</RootNamespace>
145
-  </PropertyGroup>
146
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
147
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
148
-    <ConfigurationType>StaticLibrary</ConfigurationType>
149
-    <UseDebugLibraries>true</UseDebugLibraries>
150
-    <CharacterSet>MultiByte</CharacterSet>
151
-  </PropertyGroup>
152
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
153
-    <ConfigurationType>StaticLibrary</ConfigurationType>
154
-    <UseDebugLibraries>true</UseDebugLibraries>
155
-    <CharacterSet>MultiByte</CharacterSet>
156
-  </PropertyGroup>
157
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
158
-    <ConfigurationType>StaticLibrary</ConfigurationType>
159
-    <UseDebugLibraries>false</UseDebugLibraries>
160
-    <WholeProgramOptimization>true</WholeProgramOptimization>
161
-    <CharacterSet>MultiByte</CharacterSet>
162
-  </PropertyGroup>
163
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
164
-    <ConfigurationType>StaticLibrary</ConfigurationType>
165
-    <UseDebugLibraries>false</UseDebugLibraries>
166
-    <WholeProgramOptimization>true</WholeProgramOptimization>
167
-    <CharacterSet>MultiByte</CharacterSet>
168
-  </PropertyGroup>
169
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
170
-  <ImportGroup Label="ExtensionSettings">
171
-  </ImportGroup>
172
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
173
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
174
-  </ImportGroup>
175
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
176
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
177
-  </ImportGroup>
178
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
179
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
180
-  </ImportGroup>
181
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
182
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
183
-  </ImportGroup>
184
-  <PropertyGroup Label="UserMacros"/>
185
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
186
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
187
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
188
-  </PropertyGroup>
189
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
190
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
191
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
192
-  </PropertyGroup>
193
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
194
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
195
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
196
-  </PropertyGroup>
197
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
198
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
199
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
200
-  </PropertyGroup>
201
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
202
-    <ClCompile>
203
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
204
-      <WarningLevel>Level3</WarningLevel>
205
-      <Optimization>Disabled</Optimization>
206
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
207
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
208
-      <CompileAs>CompileAsCpp</CompileAs>
209
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503</DisableSpecificWarnings>
210
-    </ClCompile>
211
-    <Link>
212
-      <SubSystem>Windows</SubSystem>
213
-      <GenerateDebugInformation>true</GenerateDebugInformation>
214
-    </Link>
215
-  </ItemDefinitionGroup>
216
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
217
-    <ClCompile>
218
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
219
-      <WarningLevel>Level3</WarningLevel>
220
-      <Optimization>Disabled</Optimization>
221
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
222
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
223
-      <CompileAs>CompileAsCpp</CompileAs>
224
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503;4267</DisableSpecificWarnings>
225
-    </ClCompile>
226
-    <Link>
227
-      <SubSystem>Windows</SubSystem>
228
-      <GenerateDebugInformation>true</GenerateDebugInformation>
229
-    </Link>
230
-  </ItemDefinitionGroup>
231
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
232
-    <ClCompile>
233
-      <WarningLevel>Level3</WarningLevel>
234
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
235
-      <Optimization>MaxSpeed</Optimization>
236
-      <FunctionLevelLinking>true</FunctionLevelLinking>
237
-      <IntrinsicFunctions>true</IntrinsicFunctions>
238
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
239
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
240
-      <CompileAs>CompileAsCpp</CompileAs>
241
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503</DisableSpecificWarnings>
242
-    </ClCompile>
243
-    <Link>
244
-      <SubSystem>Windows</SubSystem>
245
-      <GenerateDebugInformation>true</GenerateDebugInformation>
246
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
247
-      <OptimizeReferences>true</OptimizeReferences>
248
-    </Link>
249
-  </ItemDefinitionGroup>
250
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
251
-    <ClCompile>
252
-      <WarningLevel>Level3</WarningLevel>
253
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
254
-      <Optimization>MaxSpeed</Optimization>
255
-      <FunctionLevelLinking>true</FunctionLevelLinking>
256
-      <IntrinsicFunctions>true</IntrinsicFunctions>
257
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
258
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
259
-      <CompileAs>CompileAsCpp</CompileAs>
260
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503;4267</DisableSpecificWarnings>
261
-    </ClCompile>
262
-    <Link>
263
-      <SubSystem>Windows</SubSystem>
264
-      <GenerateDebugInformation>true</GenerateDebugInformation>
265
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
266
-      <OptimizeReferences>true</OptimizeReferences>
267
-    </Link>
268
-  </ItemDefinitionGroup>
269
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
270
-  <ImportGroup Label="ExtensionTargets">
271
-  </ImportGroup>
272
-</Project>
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ItemGroup Label="ProjectConfigurations">
4
+    <ProjectConfiguration Include="Debug|Win32">
5
+      <Configuration>Debug</Configuration>
6
+      <Platform>Win32</Platform>
7
+    </ProjectConfiguration>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
11
+    </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
20
+    <ProjectConfiguration Include="Release|Win32">
21
+      <Configuration>Release</Configuration>
22
+      <Platform>Win32</Platform>
23
+    </ProjectConfiguration>
24
+    <ProjectConfiguration Include="Release|x64">
25
+      <Configuration>Release</Configuration>
26
+      <Platform>x64</Platform>
27
+    </ProjectConfiguration>
28
+  </ItemGroup>
29
+  <ItemGroup>
30
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveVariables.cpp" />
31
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPrinterPass.cpp" />
32
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ProfileInfo.cpp" />
33
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAssembler.cpp" />
34
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineLoopInfo.cpp" />
35
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\DebugLoc.cpp" />
36
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PostRAHazardRecognizer.cpp" />
37
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\AliasSetTracker.cpp" />
38
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp" />
39
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAG.cpp" />
40
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\UnreachableBlockElim.cpp" />
41
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\PassRegistry.cpp" />
42
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCInst.cpp" />
43
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionCOFF.cpp" />
44
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineDominators.cpp" />
45
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JIT.cpp" />
46
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunction.cpp" />
47
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\SmallVector.cpp" />
48
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSymbol.cpp" />
49
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\SimplifyCFGPass.cpp" />
50
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\IRBuilder.cpp" />
51
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp" />
52
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Triple.cpp" />
53
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Instruction.cpp" />
54
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Value.cpp" />
55
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\ValueTypes.cpp" />
56
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\SourceMgr.cpp" />
57
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\IntrinsicInst.cpp" />
58
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\PointerTracking.cpp" />
59
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\ExecutionEngine.cpp" />
60
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITMemoryManager.cpp" />
61
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\APInt.cpp" />
62
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetLoweringObjectFile.cpp" />
63
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\IPA\CallGraph.cpp" />
64
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\LLVMContext.cpp" />
65
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\ConstantRange.cpp" />
66
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Globals.cpp" />
67
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSection.cpp" />
68
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\ValueSymbolTable.cpp" />
69
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\CaptureTracking.cpp" />
70
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Function.cpp" />
71
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITEmitter.cpp" />
72
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\TargetSelect.cpp" />
73
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Use.cpp" />
74
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\SubtargetFeature.cpp" />
75
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\ManagedStatic.cpp" />
76
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\LLVMContextImpl.cpp" />
77
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Statistic.cpp" />
78
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetInstrInfo.cpp" />
79
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Metadata.cpp" />
80
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ObjectCodeEmitter.cpp" />
81
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringExtras.cpp" />
82
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineInstr.cpp" />
83
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Pass.cpp" />
84
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\CommandLine.cpp" />
85
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\PassManager.cpp" />
86
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\AutoUpgrade.cpp" />
87
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionAnalysis.cpp" />
88
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Allocator.cpp" />
89
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringMap.cpp" />
90
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCContext.cpp" />
91
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Attributes.cpp" />
92
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ValueTracking.cpp" />
93
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\GVMaterializer.cpp" />
94
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\MemoryBuiltins.cpp" />
95
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\APFloat.cpp" />
96
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\ConstantFold.cpp" />
97
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCExpr.cpp" />
98
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetMachine.cpp" />
99
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\InlineAsm.cpp" />
100
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\circular_raw_ostream.cpp" />
101
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\TargetInstrInfoImpl.cpp" />
102
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Debug.cpp" />
103
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\Mangler.cpp" />
104
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\DCE.cpp" />
105
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PseudoSourceValue.cpp" />
106
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\TargetRegistry.cpp" />
107
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Verifier.cpp" />
108
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\LeakDetector.cpp" />
109
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringPool.cpp" />
110
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetData.cpp" />
111
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDwarfEmitter.cpp" />
112
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Dominators.cpp" />
113
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\DebugInfo.cpp" />
114
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmInfo.cpp" />
115
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Dwarf.cpp" />
116
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineBasicBlock.cpp" />
117
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Type.cpp" />
118
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ELFWriter.cpp" />
119
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\PrintModulePass.cpp" />
120
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Module.cpp" />
121
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ELFCodeEmitter.cpp" />
122
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\BasicBlock.cpp" />
123
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Timer.cpp" />
124
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDebugRegisterer.cpp" />
125
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\FoldingSet.cpp" />
126
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\SmallPtrSet.cpp" />
127
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\BasicAliasAnalysis.cpp" />
128
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\MemoryBuffer.cpp" />
129
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Instructions.cpp" />
130
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineRegisterInfo.cpp" />
131
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\OProfileJITEventListener.cpp" />
132
+    <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\Intercept.cpp" />
133
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetRegisterInfo.cpp" />
134
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\FormattedStream.cpp" />
135
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Constants.cpp" />
136
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\raw_ostream.cpp" />
137
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\Core.cpp" />
138
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\ErrorHandling.cpp" />
139
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPass.cpp" />
140
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionELF.cpp" />
141
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\Twine.cpp" />
142
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\AsmWriter.cpp" />
143
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\TypeSymbolTable.cpp" />
144
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfo.cpp" />
145
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringRef.cpp" />
146
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\AliasAnalysis.cpp" />
147
+  </ItemGroup>
148
+  <PropertyGroup Label="Globals">
149
+    <ProjectGuid>{C73EE171-635E-44AE-BED5-6D3EA981A0F3}</ProjectGuid>
150
+    <Keyword>Win32Proj</Keyword>
151
+    <RootNamespace>LLVMjit</RootNamespace>
152
+  </PropertyGroup>
153
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
154
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
155
+    <ConfigurationType>StaticLibrary</ConfigurationType>
156
+    <UseDebugLibraries>true</UseDebugLibraries>
157
+    <CharacterSet>MultiByte</CharacterSet>
158
+    <PlatformToolset>v140</PlatformToolset>
159
+  </PropertyGroup>
160
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
161
+    <ConfigurationType>StaticLibrary</ConfigurationType>
162
+    <UseDebugLibraries>true</UseDebugLibraries>
163
+    <CharacterSet>MultiByte</CharacterSet>
164
+    <PlatformToolset>v140</PlatformToolset>
165
+  </PropertyGroup>
166
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
167
+    <ConfigurationType>StaticLibrary</ConfigurationType>
168
+    <UseDebugLibraries>false</UseDebugLibraries>
169
+    <WholeProgramOptimization>true</WholeProgramOptimization>
170
+    <CharacterSet>MultiByte</CharacterSet>
171
+    <PlatformToolset>v140</PlatformToolset>
172
+  </PropertyGroup>
173
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
174
+    <ConfigurationType>StaticLibrary</ConfigurationType>
175
+    <UseDebugLibraries>false</UseDebugLibraries>
176
+    <WholeProgramOptimization>true</WholeProgramOptimization>
177
+    <CharacterSet>MultiByte</CharacterSet>
178
+    <PlatformToolset>v140</PlatformToolset>
179
+  </PropertyGroup>
180
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
181
+    <ConfigurationType>StaticLibrary</ConfigurationType>
182
+    <UseDebugLibraries>false</UseDebugLibraries>
183
+    <WholeProgramOptimization>true</WholeProgramOptimization>
184
+    <CharacterSet>MultiByte</CharacterSet>
185
+    <PlatformToolset>v140</PlatformToolset>
186
+  </PropertyGroup>
187
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
188
+    <ConfigurationType>StaticLibrary</ConfigurationType>
189
+    <UseDebugLibraries>false</UseDebugLibraries>
190
+    <WholeProgramOptimization>true</WholeProgramOptimization>
191
+    <CharacterSet>MultiByte</CharacterSet>
192
+    <PlatformToolset>v140</PlatformToolset>
193
+  </PropertyGroup>
194
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
195
+  <ImportGroup Label="ExtensionSettings">
196
+  </ImportGroup>
197
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
198
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
199
+  </ImportGroup>
200
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
201
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
202
+  </ImportGroup>
203
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
204
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
205
+  </ImportGroup>
206
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
207
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
208
+  </ImportGroup>
209
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
210
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
211
+  </ImportGroup>
212
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
213
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
214
+  </ImportGroup>
215
+  <PropertyGroup Label="UserMacros" />
216
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
217
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
218
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
219
+  </PropertyGroup>
220
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
221
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
222
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
223
+  </PropertyGroup>
224
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
225
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
226
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
227
+  </PropertyGroup>
228
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
229
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
230
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
231
+  </PropertyGroup>
232
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
233
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
234
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
235
+  </PropertyGroup>
236
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
237
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
238
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
239
+  </PropertyGroup>
240
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
241
+    <ClCompile>
242
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
243
+      <WarningLevel>Level3</WarningLevel>
244
+      <Optimization>Disabled</Optimization>
245
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
246
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
247
+      <CompileAs>CompileAsCpp</CompileAs>
248
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503</DisableSpecificWarnings>
249
+    </ClCompile>
250
+    <Link>
251
+      <SubSystem>Windows</SubSystem>
252
+      <GenerateDebugInformation>true</GenerateDebugInformation>
253
+    </Link>
254
+  </ItemDefinitionGroup>
255
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
256
+    <ClCompile>
257
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
258
+      <WarningLevel>Level3</WarningLevel>
259
+      <Optimization>Disabled</Optimization>
260
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
261
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
262
+      <CompileAs>CompileAsCpp</CompileAs>
263
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503;4267</DisableSpecificWarnings>
264
+    </ClCompile>
265
+    <Link>
266
+      <SubSystem>Windows</SubSystem>
267
+      <GenerateDebugInformation>true</GenerateDebugInformation>
268
+    </Link>
269
+  </ItemDefinitionGroup>
270
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
271
+    <ClCompile>
272
+      <WarningLevel>Level3</WarningLevel>
273
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
274
+      <Optimization>MaxSpeed</Optimization>
275
+      <FunctionLevelLinking>true</FunctionLevelLinking>
276
+      <IntrinsicFunctions>true</IntrinsicFunctions>
277
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
278
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
279
+      <CompileAs>CompileAsCpp</CompileAs>
280
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503</DisableSpecificWarnings>
281
+    </ClCompile>
282
+    <Link>
283
+      <SubSystem>Windows</SubSystem>
284
+      <GenerateDebugInformation>true</GenerateDebugInformation>
285
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
286
+      <OptimizeReferences>true</OptimizeReferences>
287
+    </Link>
288
+  </ItemDefinitionGroup>
289
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
290
+    <ClCompile>
291
+      <WarningLevel>Level3</WarningLevel>
292
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
293
+      <Optimization>MaxSpeed</Optimization>
294
+      <FunctionLevelLinking>true</FunctionLevelLinking>
295
+      <IntrinsicFunctions>true</IntrinsicFunctions>
296
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
297
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
298
+      <CompileAs>CompileAsCpp</CompileAs>
299
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503</DisableSpecificWarnings>
300
+    </ClCompile>
301
+    <Link>
302
+      <SubSystem>Windows</SubSystem>
303
+      <GenerateDebugInformation>true</GenerateDebugInformation>
304
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
305
+      <OptimizeReferences>true</OptimizeReferences>
306
+    </Link>
307
+  </ItemDefinitionGroup>
308
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
309
+    <ClCompile>
310
+      <WarningLevel>Level3</WarningLevel>
311
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
312
+      <Optimization>MaxSpeed</Optimization>
313
+      <FunctionLevelLinking>true</FunctionLevelLinking>
314
+      <IntrinsicFunctions>true</IntrinsicFunctions>
315
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
316
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
317
+      <CompileAs>CompileAsCpp</CompileAs>
318
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503;4267</DisableSpecificWarnings>
319
+    </ClCompile>
320
+    <Link>
321
+      <SubSystem>Windows</SubSystem>
322
+      <GenerateDebugInformation>true</GenerateDebugInformation>
323
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
324
+      <OptimizeReferences>true</OptimizeReferences>
325
+    </Link>
326
+  </ItemDefinitionGroup>
327
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
328
+    <ClCompile>
329
+      <WarningLevel>Level3</WarningLevel>
330
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
331
+      <Optimization>MaxSpeed</Optimization>
332
+      <FunctionLevelLinking>true</FunctionLevelLinking>
333
+      <IntrinsicFunctions>true</IntrinsicFunctions>
334
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
335
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
336
+      <CompileAs>CompileAsCpp</CompileAs>
337
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503;4267</DisableSpecificWarnings>
338
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
339
+    </ClCompile>
340
+    <Link>
341
+      <SubSystem>Windows</SubSystem>
342
+      <GenerateDebugInformation>true</GenerateDebugInformation>
343
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
344
+      <OptimizeReferences>true</OptimizeReferences>
345
+    </Link>
346
+  </ItemDefinitionGroup>
347
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
348
+  <ImportGroup Label="ExtensionTargets">
349
+  </ImportGroup>
350
+</Project>
273 351
\ No newline at end of file
... ...
@@ -64,9 +64,6 @@
64 64
     <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\IPA\CallGraph.cpp">
65 65
       <Filter>Source Files</Filter>
66 66
     </ClCompile>
67
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp">
68
-      <Filter>Source Files</Filter>
69
-    </ClCompile>
70 67
     <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\LLVMContext.cpp">
71 68
       <Filter>Source Files</Filter>
72 69
     </ClCompile>
... ...
@@ -313,5 +310,53 @@
313 313
     <ClCompile Include="..\libclamav\c++\llvm\lib\Support\StringRef.cpp">
314 314
       <Filter>Source Files</Filter>
315 315
     </ClCompile>
316
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveVariables.cpp">
317
+      <Filter>Source Files</Filter>
318
+    </ClCompile>
319
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPrinterPass.cpp">
320
+      <Filter>Source Files</Filter>
321
+    </ClCompile>
322
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\ProfileInfo.cpp">
323
+      <Filter>Source Files</Filter>
324
+    </ClCompile>
325
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAssembler.cpp">
326
+      <Filter>Source Files</Filter>
327
+    </ClCompile>
328
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineLoopInfo.cpp">
329
+      <Filter>Source Files</Filter>
330
+    </ClCompile>
331
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\DebugLoc.cpp">
332
+      <Filter>Source Files</Filter>
333
+    </ClCompile>
334
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\PostRAHazardRecognizer.cpp">
335
+      <Filter>Source Files</Filter>
336
+    </ClCompile>
337
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Analysis\AliasSetTracker.cpp">
338
+      <Filter>Source Files</Filter>
339
+    </ClCompile>
340
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp">
341
+      <Filter>Source Files</Filter>
342
+    </ClCompile>
343
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\ScheduleDAG.cpp">
344
+      <Filter>Source Files</Filter>
345
+    </ClCompile>
346
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\UnreachableBlockElim.cpp">
347
+      <Filter>Source Files</Filter>
348
+    </ClCompile>
349
+    <ClCompile Include="..\libclamav\c++\llvm\lib\VMCore\PassRegistry.cpp">
350
+      <Filter>Source Files</Filter>
351
+    </ClCompile>
352
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCInst.cpp">
353
+      <Filter>Source Files</Filter>
354
+    </ClCompile>
355
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCSectionCOFF.cpp">
356
+      <Filter>Source Files</Filter>
357
+    </ClCompile>
358
+    <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\MachineDominators.cpp">
359
+      <Filter>Source Files</Filter>
360
+    </ClCompile>
361
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Transforms\Scalar\SimplifyCFGPass.cpp">
362
+      <Filter>Source Files</Filter>
363
+    </ClCompile>
316 364
   </ItemGroup>
317 365
 </Project>
318 366
\ No newline at end of file
... ...
@@ -1,173 +1,251 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
-  <ItemGroup Label="ProjectConfigurations">
5
-    <ProjectConfiguration Include="Debug|Win32">
6
-      <Configuration>Debug</Configuration>
7
-      <Platform>Win32</Platform>
8
-    </ProjectConfiguration>
9
-    <ProjectConfiguration Include="Debug|x64">
10
-      <Configuration>Debug</Configuration>
11
-      <Platform>x64</Platform>
12
-    </ProjectConfiguration>
13
-    <ProjectConfiguration Include="Release|Win32">
14
-      <Configuration>Release</Configuration>
15
-      <Platform>Win32</Platform>
16
-    </ProjectConfiguration>
17
-    <ProjectConfiguration Include="Release|x64">
18
-      <Configuration>Release</Configuration>
19
-      <Platform>x64</Platform>
20
-    </ProjectConfiguration>
21
-  </ItemGroup>
22
-  <ItemGroup>
23
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Valgrind.cpp"/>
24
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Path.cpp"/>
25
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\ThreadLocal.cpp"/>
26
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Memory.cpp"/>
27
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\TimeValue.cpp"/>
28
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Disassembler.cpp"/>
29
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Signals.cpp"/>
30
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Process.cpp"/>
31
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Mutex.cpp"/>
32
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Threading.cpp"/>
33
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\IncludeFile.cpp"/>
34
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Errno.cpp"/>
35
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\DynamicLibrary.cpp"/>
36
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Host.cpp"/>
37
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\RWMutex.cpp"/>
38
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Program.cpp"/>
39
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Atomic.cpp"/>
40
-    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Alarm.cpp"/>
41
-  </ItemGroup>
42
-  <PropertyGroup Label="Globals">
43
-    <ProjectGuid>{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}</ProjectGuid>
44
-    <Keyword>Win32Proj</Keyword>
45
-    <RootNamespace>LLVMsystem</RootNamespace>
46
-  </PropertyGroup>
47
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
48
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
49
-    <ConfigurationType>StaticLibrary</ConfigurationType>
50
-    <UseDebugLibraries>true</UseDebugLibraries>
51
-    <CharacterSet>MultiByte</CharacterSet>
52
-  </PropertyGroup>
53
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
54
-    <ConfigurationType>StaticLibrary</ConfigurationType>
55
-    <UseDebugLibraries>true</UseDebugLibraries>
56
-    <CharacterSet>MultiByte</CharacterSet>
57
-  </PropertyGroup>
58
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
59
-    <ConfigurationType>StaticLibrary</ConfigurationType>
60
-    <UseDebugLibraries>false</UseDebugLibraries>
61
-    <WholeProgramOptimization>true</WholeProgramOptimization>
62
-    <CharacterSet>MultiByte</CharacterSet>
63
-  </PropertyGroup>
64
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
65
-    <ConfigurationType>StaticLibrary</ConfigurationType>
66
-    <UseDebugLibraries>false</UseDebugLibraries>
67
-    <WholeProgramOptimization>true</WholeProgramOptimization>
68
-    <CharacterSet>MultiByte</CharacterSet>
69
-  </PropertyGroup>
70
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
71
-  <ImportGroup Label="ExtensionSettings">
72
-  </ImportGroup>
73
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
74
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
75
-  </ImportGroup>
76
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
77
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
78
-  </ImportGroup>
79
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
80
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
81
-  </ImportGroup>
82
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
83
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
84
-  </ImportGroup>
85
-  <PropertyGroup Label="UserMacros"/>
86
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
87
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
88
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
89
-  </PropertyGroup>
90
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
91
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
92
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
93
-  </PropertyGroup>
94
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
95
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
96
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
97
-  </PropertyGroup>
98
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
99
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
100
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
101
-  </PropertyGroup>
102
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
103
-    <ClCompile>
104
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
105
-      <WarningLevel>Level3</WarningLevel>
106
-      <Optimization>Disabled</Optimization>
107
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
109
-      <CompileAs>CompileAsCpp</CompileAs>
110
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
111
-    </ClCompile>
112
-    <Link>
113
-      <SubSystem>Windows</SubSystem>
114
-      <GenerateDebugInformation>true</GenerateDebugInformation>
115
-    </Link>
116
-  </ItemDefinitionGroup>
117
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
118
-    <ClCompile>
119
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
120
-      <WarningLevel>Level3</WarningLevel>
121
-      <Optimization>Disabled</Optimization>
122
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
124
-      <CompileAs>CompileAsCpp</CompileAs>
125
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
126
-    </ClCompile>
127
-    <Link>
128
-      <SubSystem>Windows</SubSystem>
129
-      <GenerateDebugInformation>true</GenerateDebugInformation>
130
-    </Link>
131
-  </ItemDefinitionGroup>
132
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
133
-    <ClCompile>
134
-      <WarningLevel>Level3</WarningLevel>
135
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
136
-      <Optimization>MaxSpeed</Optimization>
137
-      <FunctionLevelLinking>true</FunctionLevelLinking>
138
-      <IntrinsicFunctions>true</IntrinsicFunctions>
139
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
140
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
141
-      <CompileAs>CompileAsCpp</CompileAs>
142
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
143
-    </ClCompile>
144
-    <Link>
145
-      <SubSystem>Windows</SubSystem>
146
-      <GenerateDebugInformation>true</GenerateDebugInformation>
147
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
148
-      <OptimizeReferences>true</OptimizeReferences>
149
-    </Link>
150
-  </ItemDefinitionGroup>
151
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
152
-    <ClCompile>
153
-      <WarningLevel>Level3</WarningLevel>
154
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
155
-      <Optimization>MaxSpeed</Optimization>
156
-      <FunctionLevelLinking>true</FunctionLevelLinking>
157
-      <IntrinsicFunctions>true</IntrinsicFunctions>
158
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
160
-      <CompileAs>CompileAsCpp</CompileAs>
161
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
162
-    </ClCompile>
163
-    <Link>
164
-      <SubSystem>Windows</SubSystem>
165
-      <GenerateDebugInformation>true</GenerateDebugInformation>
166
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
167
-      <OptimizeReferences>true</OptimizeReferences>
168
-    </Link>
169
-  </ItemDefinitionGroup>
170
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
171
-  <ImportGroup Label="ExtensionTargets">
172
-  </ImportGroup>
173
-</Project>
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ItemGroup Label="ProjectConfigurations">
4
+    <ProjectConfiguration Include="Debug|Win32">
5
+      <Configuration>Debug</Configuration>
6
+      <Platform>Win32</Platform>
7
+    </ProjectConfiguration>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
11
+    </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
20
+    <ProjectConfiguration Include="Release|Win32">
21
+      <Configuration>Release</Configuration>
22
+      <Platform>Win32</Platform>
23
+    </ProjectConfiguration>
24
+    <ProjectConfiguration Include="Release|x64">
25
+      <Configuration>Release</Configuration>
26
+      <Platform>x64</Platform>
27
+    </ProjectConfiguration>
28
+  </ItemGroup>
29
+  <ItemGroup>
30
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Valgrind.cpp" />
31
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Path.cpp" />
32
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\ThreadLocal.cpp" />
33
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Memory.cpp" />
34
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\TimeValue.cpp" />
35
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Disassembler.cpp" />
36
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Signals.cpp" />
37
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Process.cpp" />
38
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Mutex.cpp" />
39
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Threading.cpp" />
40
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\IncludeFile.cpp" />
41
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Errno.cpp" />
42
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\DynamicLibrary.cpp" />
43
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Host.cpp" />
44
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\RWMutex.cpp" />
45
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Program.cpp" />
46
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Atomic.cpp" />
47
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Alarm.cpp" />
48
+  </ItemGroup>
49
+  <PropertyGroup Label="Globals">
50
+    <ProjectGuid>{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}</ProjectGuid>
51
+    <Keyword>Win32Proj</Keyword>
52
+    <RootNamespace>LLVMsystem</RootNamespace>
53
+  </PropertyGroup>
54
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
55
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
56
+    <ConfigurationType>StaticLibrary</ConfigurationType>
57
+    <UseDebugLibraries>true</UseDebugLibraries>
58
+    <CharacterSet>MultiByte</CharacterSet>
59
+    <PlatformToolset>v140</PlatformToolset>
60
+  </PropertyGroup>
61
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
62
+    <ConfigurationType>StaticLibrary</ConfigurationType>
63
+    <UseDebugLibraries>true</UseDebugLibraries>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
66
+  </PropertyGroup>
67
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
68
+    <ConfigurationType>StaticLibrary</ConfigurationType>
69
+    <UseDebugLibraries>false</UseDebugLibraries>
70
+    <WholeProgramOptimization>true</WholeProgramOptimization>
71
+    <CharacterSet>MultiByte</CharacterSet>
72
+    <PlatformToolset>v140</PlatformToolset>
73
+  </PropertyGroup>
74
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
75
+    <ConfigurationType>StaticLibrary</ConfigurationType>
76
+    <UseDebugLibraries>false</UseDebugLibraries>
77
+    <WholeProgramOptimization>true</WholeProgramOptimization>
78
+    <CharacterSet>MultiByte</CharacterSet>
79
+    <PlatformToolset>v140</PlatformToolset>
80
+  </PropertyGroup>
81
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
82
+    <ConfigurationType>StaticLibrary</ConfigurationType>
83
+    <UseDebugLibraries>false</UseDebugLibraries>
84
+    <WholeProgramOptimization>true</WholeProgramOptimization>
85
+    <CharacterSet>MultiByte</CharacterSet>
86
+    <PlatformToolset>v140</PlatformToolset>
87
+  </PropertyGroup>
88
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
89
+    <ConfigurationType>StaticLibrary</ConfigurationType>
90
+    <UseDebugLibraries>false</UseDebugLibraries>
91
+    <WholeProgramOptimization>true</WholeProgramOptimization>
92
+    <CharacterSet>MultiByte</CharacterSet>
93
+    <PlatformToolset>v140</PlatformToolset>
94
+  </PropertyGroup>
95
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
96
+  <ImportGroup Label="ExtensionSettings">
97
+  </ImportGroup>
98
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
99
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
100
+  </ImportGroup>
101
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
102
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
103
+  </ImportGroup>
104
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
105
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
106
+  </ImportGroup>
107
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
108
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
109
+  </ImportGroup>
110
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
111
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
112
+  </ImportGroup>
113
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
114
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
115
+  </ImportGroup>
116
+  <PropertyGroup Label="UserMacros" />
117
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
118
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
119
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
120
+  </PropertyGroup>
121
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
122
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
123
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
124
+  </PropertyGroup>
125
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
126
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
127
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
128
+  </PropertyGroup>
129
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
130
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
131
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
132
+  </PropertyGroup>
133
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
134
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
135
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
136
+  </PropertyGroup>
137
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
138
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
139
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
140
+  </PropertyGroup>
141
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
142
+    <ClCompile>
143
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
144
+      <WarningLevel>Level3</WarningLevel>
145
+      <Optimization>Disabled</Optimization>
146
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
148
+      <CompileAs>CompileAsCpp</CompileAs>
149
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
150
+    </ClCompile>
151
+    <Link>
152
+      <SubSystem>Windows</SubSystem>
153
+      <GenerateDebugInformation>true</GenerateDebugInformation>
154
+    </Link>
155
+  </ItemDefinitionGroup>
156
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
157
+    <ClCompile>
158
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
159
+      <WarningLevel>Level3</WarningLevel>
160
+      <Optimization>Disabled</Optimization>
161
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
163
+      <CompileAs>CompileAsCpp</CompileAs>
164
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
165
+    </ClCompile>
166
+    <Link>
167
+      <SubSystem>Windows</SubSystem>
168
+      <GenerateDebugInformation>true</GenerateDebugInformation>
169
+    </Link>
170
+  </ItemDefinitionGroup>
171
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
172
+    <ClCompile>
173
+      <WarningLevel>Level3</WarningLevel>
174
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
175
+      <Optimization>MaxSpeed</Optimization>
176
+      <FunctionLevelLinking>true</FunctionLevelLinking>
177
+      <IntrinsicFunctions>true</IntrinsicFunctions>
178
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
180
+      <CompileAs>CompileAsCpp</CompileAs>
181
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
182
+    </ClCompile>
183
+    <Link>
184
+      <SubSystem>Windows</SubSystem>
185
+      <GenerateDebugInformation>true</GenerateDebugInformation>
186
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
187
+      <OptimizeReferences>true</OptimizeReferences>
188
+    </Link>
189
+  </ItemDefinitionGroup>
190
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
191
+    <ClCompile>
192
+      <WarningLevel>Level3</WarningLevel>
193
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
194
+      <Optimization>MaxSpeed</Optimization>
195
+      <FunctionLevelLinking>true</FunctionLevelLinking>
196
+      <IntrinsicFunctions>true</IntrinsicFunctions>
197
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
198
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
199
+      <CompileAs>CompileAsCpp</CompileAs>
200
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351</DisableSpecificWarnings>
201
+    </ClCompile>
202
+    <Link>
203
+      <SubSystem>Windows</SubSystem>
204
+      <GenerateDebugInformation>true</GenerateDebugInformation>
205
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
206
+      <OptimizeReferences>true</OptimizeReferences>
207
+    </Link>
208
+  </ItemDefinitionGroup>
209
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
210
+    <ClCompile>
211
+      <WarningLevel>Level3</WarningLevel>
212
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
213
+      <Optimization>MaxSpeed</Optimization>
214
+      <FunctionLevelLinking>true</FunctionLevelLinking>
215
+      <IntrinsicFunctions>true</IntrinsicFunctions>
216
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
217
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
218
+      <CompileAs>CompileAsCpp</CompileAs>
219
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
220
+    </ClCompile>
221
+    <Link>
222
+      <SubSystem>Windows</SubSystem>
223
+      <GenerateDebugInformation>true</GenerateDebugInformation>
224
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
225
+      <OptimizeReferences>true</OptimizeReferences>
226
+    </Link>
227
+  </ItemDefinitionGroup>
228
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
229
+    <ClCompile>
230
+      <WarningLevel>Level3</WarningLevel>
231
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
232
+      <Optimization>MaxSpeed</Optimization>
233
+      <FunctionLevelLinking>true</FunctionLevelLinking>
234
+      <IntrinsicFunctions>true</IntrinsicFunctions>
235
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
236
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
237
+      <CompileAs>CompileAsCpp</CompileAs>
238
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
239
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
240
+    </ClCompile>
241
+    <Link>
242
+      <SubSystem>Windows</SubSystem>
243
+      <GenerateDebugInformation>true</GenerateDebugInformation>
244
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
245
+      <OptimizeReferences>true</OptimizeReferences>
246
+    </Link>
247
+  </ItemDefinitionGroup>
248
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
249
+  <ImportGroup Label="ExtensionTargets">
250
+  </ImportGroup>
251
+</Project>
174 252
\ No newline at end of file
... ...
@@ -58,5 +58,8 @@
58 58
     <ClCompile Include="..\libclamav\c++\llvm\lib\System\Atomic.cpp">
59 59
       <Filter>Source Files</Filter>
60 60
     </ClCompile>
61
+    <ClCompile Include="..\libclamav\c++\llvm\lib\System\Valgrind.cpp">
62
+      <Filter>Source Files</Filter>
63
+    </ClCompile>
61 64
   </ItemGroup>
62 65
 </Project>
63 66
\ No newline at end of file
... ...
@@ -1,195 +1,274 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
-  <ItemGroup Label="ProjectConfigurations">
5
-    <ProjectConfiguration Include="Debug|Win32">
6
-      <Configuration>Debug</Configuration>
7
-      <Platform>Win32</Platform>
8
-    </ProjectConfiguration>
9
-    <ProjectConfiguration Include="Debug|x64">
10
-      <Configuration>Debug</Configuration>
11
-      <Platform>x64</Platform>
12
-    </ProjectConfiguration>
13
-    <ProjectConfiguration Include="Release|Win32">
14
-      <Configuration>Release</Configuration>
15
-      <Platform>Win32</Platform>
16
-    </ProjectConfiguration>
17
-    <ProjectConfiguration Include="Release|x64">
18
-      <Configuration>Release</Configuration>
19
-      <Platform>x64</Platform>
20
-    </ProjectConfiguration>
21
-  </ItemGroup>
22
-  <ItemGroup>
23
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\SSEDomainFix.cpp"/>
24
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp"/>
25
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\ELFObjectWriter.cpp"/>
26
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\WinCOFFStreamer.cpp"/>
27
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86SelectionDAGInfo.cpp"/>
28
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\WinCOFFObjectWriter.cpp"/>
29
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MachObjectWriter.cpp"/>
30
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCObjectWriter.cpp"/>
31
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCELFStreamer.cpp"/>
32
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCObjectStreamer.cpp"/>
33
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86AsmBackend.cpp"/>
34
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86ISelLowering.cpp"/>
35
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCCodeEmitter.cpp"/>
36
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86FloatingPoint.cpp"/>
37
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86FastISel.cpp"/>
38
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86CodeEmitter.cpp"/>
39
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\TargetAsmBackend.cpp"/>
40
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86RegisterInfo.cpp"/>
41
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86ELFWriterInfo.cpp"/>
42
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86JITInfo.cpp"/>
43
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetELFWriterInfo.cpp"/>
44
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86InstrInfo.cpp"/>
45
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\TargetInfo\X86TargetInfo.cpp"/>
46
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86ISelDAGToDAG.cpp"/>
47
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86MCCodeEmitter.cpp"/>
48
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86Subtarget.cpp"/>
49
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86COFFMachineModuleInfo.cpp"/>
50
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86MCAsmInfo.cpp"/>
51
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86TargetMachine.cpp"/>
52
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86TargetObjectFile.cpp"/>
53
-    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmInfoCOFF.cpp"/>
54
-  </ItemGroup>
55
-  <ItemGroup>
56
-    <MASM Include="..\libclamav\c++\llvm\lib\Target\X86\X86CompilationCallback_Win64.asm">
57
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
58
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
59
-      <FileType>Document</FileType>
60
-    </MASM>
61
-  </ItemGroup>
62
-  <PropertyGroup Label="Globals">
63
-    <ProjectGuid>{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}</ProjectGuid>
64
-    <Keyword>Win32Proj</Keyword>
65
-    <RootNamespace>LLVMx86codegen</RootNamespace>
66
-  </PropertyGroup>
67
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
68
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
69
-    <ConfigurationType>StaticLibrary</ConfigurationType>
70
-    <UseDebugLibraries>true</UseDebugLibraries>
71
-    <CharacterSet>MultiByte</CharacterSet>
72
-  </PropertyGroup>
73
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
74
-    <ConfigurationType>StaticLibrary</ConfigurationType>
75
-    <UseDebugLibraries>true</UseDebugLibraries>
76
-    <CharacterSet>MultiByte</CharacterSet>
77
-  </PropertyGroup>
78
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
79
-    <ConfigurationType>StaticLibrary</ConfigurationType>
80
-    <UseDebugLibraries>false</UseDebugLibraries>
81
-    <WholeProgramOptimization>true</WholeProgramOptimization>
82
-    <CharacterSet>MultiByte</CharacterSet>
83
-  </PropertyGroup>
84
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
85
-    <ConfigurationType>StaticLibrary</ConfigurationType>
86
-    <UseDebugLibraries>false</UseDebugLibraries>
87
-    <WholeProgramOptimization>true</WholeProgramOptimization>
88
-    <CharacterSet>MultiByte</CharacterSet>
89
-  </PropertyGroup>
90
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
91
-  <ImportGroup Label="ExtensionSettings">
92
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props"/>
93
-  </ImportGroup>
94
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
95
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
96
-  </ImportGroup>
97
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
98
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
99
-  </ImportGroup>
100
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
101
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
102
-  </ImportGroup>
103
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
104
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
105
-  </ImportGroup>
106
-  <PropertyGroup Label="UserMacros"/>
107
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
108
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
109
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
110
-  </PropertyGroup>
111
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
112
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
113
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
114
-  </PropertyGroup>
115
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
116
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
117
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
118
-  </PropertyGroup>
119
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
120
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
121
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
122
-  </PropertyGroup>
123
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
124
-    <ClCompile>
125
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
126
-      <WarningLevel>Level3</WarningLevel>
127
-      <Optimization>Disabled</Optimization>
128
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
129
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
130
-      <CompileAs>CompileAsCpp</CompileAs>
131
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
132
-    </ClCompile>
133
-    <Link>
134
-      <SubSystem>Windows</SubSystem>
135
-      <GenerateDebugInformation>true</GenerateDebugInformation>
136
-    </Link>
137
-  </ItemDefinitionGroup>
138
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
139
-    <ClCompile>
140
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
141
-      <WarningLevel>Level3</WarningLevel>
142
-      <Optimization>Disabled</Optimization>
143
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
145
-      <CompileAs>CompileAsCpp</CompileAs>
146
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
147
-    </ClCompile>
148
-    <Link>
149
-      <SubSystem>Windows</SubSystem>
150
-      <GenerateDebugInformation>true</GenerateDebugInformation>
151
-    </Link>
152
-  </ItemDefinitionGroup>
153
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
154
-    <ClCompile>
155
-      <WarningLevel>Level3</WarningLevel>
156
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
157
-      <Optimization>MaxSpeed</Optimization>
158
-      <FunctionLevelLinking>true</FunctionLevelLinking>
159
-      <IntrinsicFunctions>true</IntrinsicFunctions>
160
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
161
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
162
-      <CompileAs>CompileAsCpp</CompileAs>
163
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
164
-    </ClCompile>
165
-    <Link>
166
-      <SubSystem>Windows</SubSystem>
167
-      <GenerateDebugInformation>true</GenerateDebugInformation>
168
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
169
-      <OptimizeReferences>true</OptimizeReferences>
170
-    </Link>
171
-  </ItemDefinitionGroup>
172
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
173
-    <ClCompile>
174
-      <WarningLevel>Level3</WarningLevel>
175
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
176
-      <Optimization>MaxSpeed</Optimization>
177
-      <FunctionLevelLinking>true</FunctionLevelLinking>
178
-      <IntrinsicFunctions>true</IntrinsicFunctions>
179
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180
-      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
181
-      <CompileAs>CompileAsCpp</CompileAs>
182
-      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
183
-    </ClCompile>
184
-    <Link>
185
-      <SubSystem>Windows</SubSystem>
186
-      <GenerateDebugInformation>true</GenerateDebugInformation>
187
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
188
-      <OptimizeReferences>true</OptimizeReferences>
189
-    </Link>
190
-  </ItemDefinitionGroup>
191
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
192
-  <ImportGroup Label="ExtensionTargets">
193
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets"/>
194
-  </ImportGroup>
195
-</Project>
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ItemGroup Label="ProjectConfigurations">
4
+    <ProjectConfiguration Include="Debug|Win32">
5
+      <Configuration>Debug</Configuration>
6
+      <Platform>Win32</Platform>
7
+    </ProjectConfiguration>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
11
+    </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
20
+    <ProjectConfiguration Include="Release|Win32">
21
+      <Configuration>Release</Configuration>
22
+      <Platform>Win32</Platform>
23
+    </ProjectConfiguration>
24
+    <ProjectConfiguration Include="Release|x64">
25
+      <Configuration>Release</Configuration>
26
+      <Platform>x64</Platform>
27
+    </ProjectConfiguration>
28
+  </ItemGroup>
29
+  <ItemGroup>
30
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\SSEDomainFix.cpp" />
31
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp" />
32
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\ELFObjectWriter.cpp" />
33
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\WinCOFFStreamer.cpp" />
34
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86SelectionDAGInfo.cpp" />
35
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\WinCOFFObjectWriter.cpp" />
36
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MachObjectWriter.cpp" />
37
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCObjectWriter.cpp" />
38
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCELFStreamer.cpp" />
39
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCObjectStreamer.cpp" />
40
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86AsmBackend.cpp" />
41
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86ISelLowering.cpp" />
42
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCCodeEmitter.cpp" />
43
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86FloatingPoint.cpp" />
44
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86FastISel.cpp" />
45
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86CodeEmitter.cpp" />
46
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\TargetAsmBackend.cpp" />
47
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86RegisterInfo.cpp" />
48
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86ELFWriterInfo.cpp" />
49
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86JITInfo.cpp" />
50
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\TargetELFWriterInfo.cpp" />
51
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86InstrInfo.cpp" />
52
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\TargetInfo\X86TargetInfo.cpp" />
53
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86ISelDAGToDAG.cpp" />
54
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86MCCodeEmitter.cpp" />
55
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86Subtarget.cpp" />
56
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86COFFMachineModuleInfo.cpp" />
57
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86MCAsmInfo.cpp" />
58
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86TargetMachine.cpp" />
59
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86TargetObjectFile.cpp" />
60
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmInfoCOFF.cpp" />
61
+  </ItemGroup>
62
+  <ItemGroup>
63
+    <MASM Include="..\libclamav\c++\llvm\lib\Target\X86\X86CompilationCallback_Win64.asm">
64
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
65
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
66
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
67
+      <FileType>Document</FileType>
68
+    </MASM>
69
+  </ItemGroup>
70
+  <PropertyGroup Label="Globals">
71
+    <ProjectGuid>{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}</ProjectGuid>
72
+    <Keyword>Win32Proj</Keyword>
73
+    <RootNamespace>LLVMx86codegen</RootNamespace>
74
+  </PropertyGroup>
75
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
76
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
77
+    <ConfigurationType>StaticLibrary</ConfigurationType>
78
+    <UseDebugLibraries>true</UseDebugLibraries>
79
+    <CharacterSet>MultiByte</CharacterSet>
80
+    <PlatformToolset>v140</PlatformToolset>
81
+  </PropertyGroup>
82
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
83
+    <ConfigurationType>StaticLibrary</ConfigurationType>
84
+    <UseDebugLibraries>true</UseDebugLibraries>
85
+    <CharacterSet>MultiByte</CharacterSet>
86
+    <PlatformToolset>v140</PlatformToolset>
87
+  </PropertyGroup>
88
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
89
+    <ConfigurationType>StaticLibrary</ConfigurationType>
90
+    <UseDebugLibraries>false</UseDebugLibraries>
91
+    <WholeProgramOptimization>true</WholeProgramOptimization>
92
+    <CharacterSet>MultiByte</CharacterSet>
93
+    <PlatformToolset>v140</PlatformToolset>
94
+  </PropertyGroup>
95
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
96
+    <ConfigurationType>StaticLibrary</ConfigurationType>
97
+    <UseDebugLibraries>false</UseDebugLibraries>
98
+    <WholeProgramOptimization>true</WholeProgramOptimization>
99
+    <CharacterSet>MultiByte</CharacterSet>
100
+    <PlatformToolset>v140</PlatformToolset>
101
+  </PropertyGroup>
102
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
103
+    <ConfigurationType>StaticLibrary</ConfigurationType>
104
+    <UseDebugLibraries>false</UseDebugLibraries>
105
+    <WholeProgramOptimization>true</WholeProgramOptimization>
106
+    <CharacterSet>MultiByte</CharacterSet>
107
+    <PlatformToolset>v140</PlatformToolset>
108
+  </PropertyGroup>
109
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
110
+    <ConfigurationType>StaticLibrary</ConfigurationType>
111
+    <UseDebugLibraries>false</UseDebugLibraries>
112
+    <WholeProgramOptimization>true</WholeProgramOptimization>
113
+    <CharacterSet>MultiByte</CharacterSet>
114
+    <PlatformToolset>v140</PlatformToolset>
115
+  </PropertyGroup>
116
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
117
+  <ImportGroup Label="ExtensionSettings">
118
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
119
+  </ImportGroup>
120
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
121
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
122
+  </ImportGroup>
123
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
124
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
125
+  </ImportGroup>
126
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
127
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
128
+  </ImportGroup>
129
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
130
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
131
+  </ImportGroup>
132
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
133
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
134
+  </ImportGroup>
135
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
136
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
137
+  </ImportGroup>
138
+  <PropertyGroup Label="UserMacros" />
139
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
140
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
141
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
142
+  </PropertyGroup>
143
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
144
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
145
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
146
+  </PropertyGroup>
147
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
148
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
149
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
150
+  </PropertyGroup>
151
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
152
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
153
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
154
+  </PropertyGroup>
155
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
156
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
157
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
158
+  </PropertyGroup>
159
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
160
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
161
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
162
+  </PropertyGroup>
163
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
164
+    <ClCompile>
165
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
166
+      <WarningLevel>Level3</WarningLevel>
167
+      <Optimization>Disabled</Optimization>
168
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
170
+      <CompileAs>CompileAsCpp</CompileAs>
171
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
172
+    </ClCompile>
173
+    <Link>
174
+      <SubSystem>Windows</SubSystem>
175
+      <GenerateDebugInformation>true</GenerateDebugInformation>
176
+    </Link>
177
+  </ItemDefinitionGroup>
178
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
179
+    <ClCompile>
180
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
181
+      <WarningLevel>Level3</WarningLevel>
182
+      <Optimization>Disabled</Optimization>
183
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
185
+      <CompileAs>CompileAsCpp</CompileAs>
186
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
187
+    </ClCompile>
188
+    <Link>
189
+      <SubSystem>Windows</SubSystem>
190
+      <GenerateDebugInformation>true</GenerateDebugInformation>
191
+    </Link>
192
+  </ItemDefinitionGroup>
193
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
194
+    <ClCompile>
195
+      <WarningLevel>Level3</WarningLevel>
196
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
197
+      <Optimization>MaxSpeed</Optimization>
198
+      <FunctionLevelLinking>true</FunctionLevelLinking>
199
+      <IntrinsicFunctions>true</IntrinsicFunctions>
200
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
201
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
202
+      <CompileAs>CompileAsCpp</CompileAs>
203
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
204
+    </ClCompile>
205
+    <Link>
206
+      <SubSystem>Windows</SubSystem>
207
+      <GenerateDebugInformation>true</GenerateDebugInformation>
208
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
209
+      <OptimizeReferences>true</OptimizeReferences>
210
+    </Link>
211
+  </ItemDefinitionGroup>
212
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
213
+    <ClCompile>
214
+      <WarningLevel>Level3</WarningLevel>
215
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
216
+      <Optimization>MaxSpeed</Optimization>
217
+      <FunctionLevelLinking>true</FunctionLevelLinking>
218
+      <IntrinsicFunctions>true</IntrinsicFunctions>
219
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
220
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
221
+      <CompileAs>CompileAsCpp</CompileAs>
222
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
223
+    </ClCompile>
224
+    <Link>
225
+      <SubSystem>Windows</SubSystem>
226
+      <GenerateDebugInformation>true</GenerateDebugInformation>
227
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
228
+      <OptimizeReferences>true</OptimizeReferences>
229
+    </Link>
230
+  </ItemDefinitionGroup>
231
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
232
+    <ClCompile>
233
+      <WarningLevel>Level3</WarningLevel>
234
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
235
+      <Optimization>MaxSpeed</Optimization>
236
+      <FunctionLevelLinking>true</FunctionLevelLinking>
237
+      <IntrinsicFunctions>true</IntrinsicFunctions>
238
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
239
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
240
+      <CompileAs>CompileAsCpp</CompileAs>
241
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
242
+    </ClCompile>
243
+    <Link>
244
+      <SubSystem>Windows</SubSystem>
245
+      <GenerateDebugInformation>true</GenerateDebugInformation>
246
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
247
+      <OptimizeReferences>true</OptimizeReferences>
248
+    </Link>
249
+  </ItemDefinitionGroup>
250
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
251
+    <ClCompile>
252
+      <WarningLevel>Level3</WarningLevel>
253
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
254
+      <Optimization>MaxSpeed</Optimization>
255
+      <FunctionLevelLinking>true</FunctionLevelLinking>
256
+      <IntrinsicFunctions>true</IntrinsicFunctions>
257
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
258
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
259
+      <CompileAs>CompileAsCpp</CompileAs>
260
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4065;4267</DisableSpecificWarnings>
261
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
262
+    </ClCompile>
263
+    <Link>
264
+      <SubSystem>Windows</SubSystem>
265
+      <GenerateDebugInformation>true</GenerateDebugInformation>
266
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
267
+      <OptimizeReferences>true</OptimizeReferences>
268
+    </Link>
269
+  </ItemDefinitionGroup>
270
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
271
+  <ImportGroup Label="ExtensionTargets">
272
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
273
+  </ImportGroup>
274
+</Project>
196 275
\ No newline at end of file
... ...
@@ -16,9 +16,6 @@
16 16
     <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86ISelLowering.cpp">
17 17
       <Filter>Source Files</Filter>
18 18
     </ClCompile>
19
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86FloatingPointRegKill.cpp">
20
-      <Filter>Source Files</Filter>
21
-    </ClCompile>
22 19
     <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCCodeEmitter.cpp">
23 20
       <Filter>Source Files</Filter>
24 21
     </ClCompile>
... ...
@@ -67,15 +64,42 @@
67 67
     <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86MCAsmInfo.cpp">
68 68
       <Filter>Source Files</Filter>
69 69
     </ClCompile>
70
-    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86MCTargetExpr.cpp">
71
-      <Filter>Source Files</Filter>
72
-    </ClCompile>
73 70
     <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86TargetMachine.cpp">
74 71
       <Filter>Source Files</Filter>
75 72
     </ClCompile>
76 73
     <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86TargetObjectFile.cpp">
77 74
       <Filter>Source Files</Filter>
78 75
     </ClCompile>
76
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\SSEDomainFix.cpp">
77
+      <Filter>Source Files</Filter>
78
+    </ClCompile>
79
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp">
80
+      <Filter>Source Files</Filter>
81
+    </ClCompile>
82
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\ELFObjectWriter.cpp">
83
+      <Filter>Source Files</Filter>
84
+    </ClCompile>
85
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\WinCOFFStreamer.cpp">
86
+      <Filter>Source Files</Filter>
87
+    </ClCompile>
88
+    <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86SelectionDAGInfo.cpp">
89
+      <Filter>Source Files</Filter>
90
+    </ClCompile>
91
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\WinCOFFObjectWriter.cpp">
92
+      <Filter>Source Files</Filter>
93
+    </ClCompile>
94
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MachObjectWriter.cpp">
95
+      <Filter>Source Files</Filter>
96
+    </ClCompile>
97
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCObjectWriter.cpp">
98
+      <Filter>Source Files</Filter>
99
+    </ClCompile>
100
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCELFStreamer.cpp">
101
+      <Filter>Source Files</Filter>
102
+    </ClCompile>
103
+    <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCObjectStreamer.cpp">
104
+      <Filter>Source Files</Filter>
105
+    </ClCompile>
79 106
   </ItemGroup>
80 107
   <ItemGroup>
81 108
     <MASM Include="..\libclamav\c++\llvm\lib\Target\X86\X86CompilationCallback_Win64.asm">
82 109
new file mode 100644
83 110
Binary files /dev/null and b/win32/UpgradeLog.htm differ
84 111
new file mode 100644
85 112
Binary files /dev/null and b/win32/UpgradeLog2.htm differ
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>Application</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>Application</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>Application</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>Application</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>Application</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -96,6 +138,7 @@
96 96
       <SubSystem>Console</SubSystem>
97 97
       <GenerateDebugInformation>true</GenerateDebugInformation>
98 98
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99
+      <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>
99 100
     </Link>
100 101
   </ItemDefinitionGroup>
101 102
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -103,7 +146,7 @@
103 103
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
104 104
       <WarningLevel>Level3</WarningLevel>
105 105
       <Optimization>Disabled</Optimization>
106
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 107
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108
       <CompileAs>CompileAsC</CompileAs>
109 109
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -112,6 +155,7 @@
112 112
       <SubSystem>Console</SubSystem>
113 113
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 114
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115
+      <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>
115 116
     </Link>
116 117
   </ItemDefinitionGroup>
117 118
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -121,7 +165,28 @@
121 121
       <Optimization>MaxSpeed</Optimization>
122 122
       <FunctionLevelLinking>true</FunctionLevelLinking>
123 123
       <IntrinsicFunctions>true</IntrinsicFunctions>
124
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126
+      <CompileAs>CompileAsC</CompileAs>
127
+      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
128
+    </ClCompile>
129
+    <Link>
130
+      <SubSystem>Console</SubSystem>
131
+      <GenerateDebugInformation>true</GenerateDebugInformation>
132
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
133
+      <OptimizeReferences>true</OptimizeReferences>
134
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
136
+    </Link>
137
+  </ItemDefinitionGroup>
138
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
139
+    <ClCompile>
140
+      <WarningLevel>Level3</WarningLevel>
141
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
142
+      <Optimization>MaxSpeed</Optimization>
143
+      <FunctionLevelLinking>true</FunctionLevelLinking>
144
+      <IntrinsicFunctions>true</IntrinsicFunctions>
145
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125 146
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126 147
       <CompileAs>CompileAsC</CompileAs>
127 148
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -132,6 +197,7 @@
132 132
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
133 133
       <OptimizeReferences>true</OptimizeReferences>
134 134
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
135 136
     </Link>
136 137
   </ItemDefinitionGroup>
137 138
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -141,7 +207,28 @@
141 141
       <Optimization>MaxSpeed</Optimization>
142 142
       <FunctionLevelLinking>true</FunctionLevelLinking>
143 143
       <IntrinsicFunctions>true</IntrinsicFunctions>
144
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146
+      <CompileAs>CompileAsC</CompileAs>
147
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
148
+    </ClCompile>
149
+    <Link>
150
+      <SubSystem>Console</SubSystem>
151
+      <GenerateDebugInformation>true</GenerateDebugInformation>
152
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
153
+      <OptimizeReferences>true</OptimizeReferences>
154
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
156
+    </Link>
157
+  </ItemDefinitionGroup>
158
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
159
+    <ClCompile>
160
+      <WarningLevel>Level3</WarningLevel>
161
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
162
+      <Optimization>MaxSpeed</Optimization>
163
+      <FunctionLevelLinking>true</FunctionLevelLinking>
164
+      <IntrinsicFunctions>true</IntrinsicFunctions>
165
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145 166
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146 167
       <CompileAs>CompileAsC</CompileAs>
147 168
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -152,6 +239,7 @@
152 152
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
153 153
       <OptimizeReferences>true</OptimizeReferences>
154 154
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
155 156
     </Link>
156 157
   </ItemDefinitionGroup>
157 158
   <ItemGroup>
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>Application</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>Application</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>Application</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>Application</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>Application</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -96,6 +138,7 @@
96 96
       <SubSystem>Console</SubSystem>
97 97
       <GenerateDebugInformation>true</GenerateDebugInformation>
98 98
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99
+      <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>
99 100
     </Link>
100 101
   </ItemDefinitionGroup>
101 102
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -103,7 +146,7 @@
103 103
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
104 104
       <WarningLevel>Level3</WarningLevel>
105 105
       <Optimization>Disabled</Optimization>
106
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 107
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108
       <CompileAs>CompileAsC</CompileAs>
109 109
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -112,6 +155,7 @@
112 112
       <SubSystem>Console</SubSystem>
113 113
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 114
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115
+      <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>
115 116
     </Link>
116 117
   </ItemDefinitionGroup>
117 118
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -121,7 +165,28 @@
121 121
       <Optimization>MaxSpeed</Optimization>
122 122
       <FunctionLevelLinking>true</FunctionLevelLinking>
123 123
       <IntrinsicFunctions>true</IntrinsicFunctions>
124
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126
+      <CompileAs>CompileAsC</CompileAs>
127
+      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
128
+    </ClCompile>
129
+    <Link>
130
+      <SubSystem>Console</SubSystem>
131
+      <GenerateDebugInformation>true</GenerateDebugInformation>
132
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
133
+      <OptimizeReferences>true</OptimizeReferences>
134
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
136
+    </Link>
137
+  </ItemDefinitionGroup>
138
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
139
+    <ClCompile>
140
+      <WarningLevel>Level3</WarningLevel>
141
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
142
+      <Optimization>MaxSpeed</Optimization>
143
+      <FunctionLevelLinking>true</FunctionLevelLinking>
144
+      <IntrinsicFunctions>true</IntrinsicFunctions>
145
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125 146
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126 147
       <CompileAs>CompileAsC</CompileAs>
127 148
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -132,6 +197,7 @@
132 132
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
133 133
       <OptimizeReferences>true</OptimizeReferences>
134 134
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
135 136
     </Link>
136 137
   </ItemDefinitionGroup>
137 138
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -141,7 +207,28 @@
141 141
       <Optimization>MaxSpeed</Optimization>
142 142
       <FunctionLevelLinking>true</FunctionLevelLinking>
143 143
       <IntrinsicFunctions>true</IntrinsicFunctions>
144
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146
+      <CompileAs>CompileAsC</CompileAs>
147
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
148
+    </ClCompile>
149
+    <Link>
150
+      <SubSystem>Console</SubSystem>
151
+      <GenerateDebugInformation>true</GenerateDebugInformation>
152
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
153
+      <OptimizeReferences>true</OptimizeReferences>
154
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
156
+    </Link>
157
+  </ItemDefinitionGroup>
158
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
159
+    <ClCompile>
160
+      <WarningLevel>Level3</WarningLevel>
161
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
162
+      <Optimization>MaxSpeed</Optimization>
163
+      <FunctionLevelLinking>true</FunctionLevelLinking>
164
+      <IntrinsicFunctions>true</IntrinsicFunctions>
165
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145 166
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146 167
       <CompileAs>CompileAsC</CompileAs>
147 168
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -152,6 +239,7 @@
152 152
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
153 153
       <OptimizeReferences>true</OptimizeReferences>
154 154
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
155 156
     </Link>
156 157
   </ItemDefinitionGroup>
157 158
   <ItemGroup>
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>Application</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>Application</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>Application</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>Application</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>Application</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings>
... ...
@@ -96,6 +138,7 @@
96 96
       <SubSystem>Console</SubSystem>
97 97
       <GenerateDebugInformation>true</GenerateDebugInformation>
98 98
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99
+      <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>
99 100
     </Link>
100 101
   </ItemDefinitionGroup>
101 102
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -103,7 +146,7 @@
103 103
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
104 104
       <WarningLevel>Level3</WarningLevel>
105 105
       <Optimization>Disabled</Optimization>
106
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 107
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108
       <CompileAs>CompileAsC</CompileAs>
109 109
       <DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings>
... ...
@@ -112,6 +155,7 @@
112 112
       <SubSystem>Console</SubSystem>
113 113
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 114
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115
+      <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>
115 116
     </Link>
116 117
   </ItemDefinitionGroup>
117 118
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -121,7 +165,28 @@
121 121
       <Optimization>MaxSpeed</Optimization>
122 122
       <FunctionLevelLinking>true</FunctionLevelLinking>
123 123
       <IntrinsicFunctions>true</IntrinsicFunctions>
124
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126
+      <CompileAs>CompileAsC</CompileAs>
127
+      <DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings>
128
+    </ClCompile>
129
+    <Link>
130
+      <SubSystem>Console</SubSystem>
131
+      <GenerateDebugInformation>true</GenerateDebugInformation>
132
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
133
+      <OptimizeReferences>true</OptimizeReferences>
134
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
136
+    </Link>
137
+  </ItemDefinitionGroup>
138
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
139
+    <ClCompile>
140
+      <WarningLevel>Level3</WarningLevel>
141
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
142
+      <Optimization>MaxSpeed</Optimization>
143
+      <FunctionLevelLinking>true</FunctionLevelLinking>
144
+      <IntrinsicFunctions>true</IntrinsicFunctions>
145
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125 146
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126 147
       <CompileAs>CompileAsC</CompileAs>
127 148
       <DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings>
... ...
@@ -132,6 +197,7 @@
132 132
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
133 133
       <OptimizeReferences>true</OptimizeReferences>
134 134
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
135 136
     </Link>
136 137
   </ItemDefinitionGroup>
137 138
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -141,7 +207,28 @@
141 141
       <Optimization>MaxSpeed</Optimization>
142 142
       <FunctionLevelLinking>true</FunctionLevelLinking>
143 143
       <IntrinsicFunctions>true</IntrinsicFunctions>
144
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146
+      <CompileAs>CompileAsC</CompileAs>
147
+      <DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings>
148
+    </ClCompile>
149
+    <Link>
150
+      <SubSystem>Console</SubSystem>
151
+      <GenerateDebugInformation>true</GenerateDebugInformation>
152
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
153
+      <OptimizeReferences>true</OptimizeReferences>
154
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
156
+    </Link>
157
+  </ItemDefinitionGroup>
158
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
159
+    <ClCompile>
160
+      <WarningLevel>Level3</WarningLevel>
161
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
162
+      <Optimization>MaxSpeed</Optimization>
163
+      <FunctionLevelLinking>true</FunctionLevelLinking>
164
+      <IntrinsicFunctions>true</IntrinsicFunctions>
165
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145 166
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146 167
       <CompileAs>CompileAsC</CompileAs>
147 168
       <DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings>
... ...
@@ -152,6 +239,7 @@
152 152
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
153 153
       <OptimizeReferences>true</OptimizeReferences>
154 154
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
155 156
     </Link>
156 157
   </ItemDefinitionGroup>
157 158
   <ItemGroup>
... ...
@@ -178,4 +266,4 @@
178 178
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
179 179
   <ImportGroup Label="ExtensionTargets">
180 180
   </ImportGroup>
181
-</Project>
181
+</Project>
182 182
\ No newline at end of file
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>Application</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>Application</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>Application</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>Application</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>Application</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -96,6 +138,7 @@
96 96
       <SubSystem>Console</SubSystem>
97 97
       <GenerateDebugInformation>true</GenerateDebugInformation>
98 98
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99
+      <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>
99 100
     </Link>
100 101
   </ItemDefinitionGroup>
101 102
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -103,7 +146,7 @@
103 103
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
104 104
       <WarningLevel>Level3</WarningLevel>
105 105
       <Optimization>Disabled</Optimization>
106
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 107
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108
       <CompileAs>CompileAsC</CompileAs>
109 109
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -112,6 +155,7 @@
112 112
       <SubSystem>Console</SubSystem>
113 113
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 114
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115
+      <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>
115 116
     </Link>
116 117
   </ItemDefinitionGroup>
117 118
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -121,7 +165,28 @@
121 121
       <Optimization>MaxSpeed</Optimization>
122 122
       <FunctionLevelLinking>true</FunctionLevelLinking>
123 123
       <IntrinsicFunctions>true</IntrinsicFunctions>
124
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126
+      <CompileAs>CompileAsC</CompileAs>
127
+      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
128
+    </ClCompile>
129
+    <Link>
130
+      <SubSystem>Console</SubSystem>
131
+      <GenerateDebugInformation>true</GenerateDebugInformation>
132
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
133
+      <OptimizeReferences>true</OptimizeReferences>
134
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
136
+    </Link>
137
+  </ItemDefinitionGroup>
138
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
139
+    <ClCompile>
140
+      <WarningLevel>Level3</WarningLevel>
141
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
142
+      <Optimization>MaxSpeed</Optimization>
143
+      <FunctionLevelLinking>true</FunctionLevelLinking>
144
+      <IntrinsicFunctions>true</IntrinsicFunctions>
145
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125 146
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126 147
       <CompileAs>CompileAsC</CompileAs>
127 148
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -132,6 +197,7 @@
132 132
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
133 133
       <OptimizeReferences>true</OptimizeReferences>
134 134
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
135 136
     </Link>
136 137
   </ItemDefinitionGroup>
137 138
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -141,7 +207,28 @@
141 141
       <Optimization>MaxSpeed</Optimization>
142 142
       <FunctionLevelLinking>true</FunctionLevelLinking>
143 143
       <IntrinsicFunctions>true</IntrinsicFunctions>
144
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146
+      <CompileAs>CompileAsC</CompileAs>
147
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
148
+    </ClCompile>
149
+    <Link>
150
+      <SubSystem>Console</SubSystem>
151
+      <GenerateDebugInformation>true</GenerateDebugInformation>
152
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
153
+      <OptimizeReferences>true</OptimizeReferences>
154
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
156
+    </Link>
157
+  </ItemDefinitionGroup>
158
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
159
+    <ClCompile>
160
+      <WarningLevel>Level3</WarningLevel>
161
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
162
+      <Optimization>MaxSpeed</Optimization>
163
+      <FunctionLevelLinking>true</FunctionLevelLinking>
164
+      <IntrinsicFunctions>true</IntrinsicFunctions>
165
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145 166
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146 167
       <CompileAs>CompileAsC</CompileAs>
147 168
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -152,6 +239,7 @@
152 152
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
153 153
       <OptimizeReferences>true</OptimizeReferences>
154 154
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
155 156
     </Link>
156 157
   </ItemDefinitionGroup>
157 158
   <ItemGroup>
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>Application</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>Application</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>Application</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>Application</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>Application</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -95,6 +137,7 @@
95 95
     <Link>
96 96
       <SubSystem>Console</SubSystem>
97 97
       <GenerateDebugInformation>true</GenerateDebugInformation>
98
+      <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>
98 99
     </Link>
99 100
   </ItemDefinitionGroup>
100 101
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -102,7 +145,7 @@
102 102
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
103 103
       <WarningLevel>Level3</WarningLevel>
104 104
       <Optimization>Disabled</Optimization>
105
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106 106
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
107 107
       <CompileAs>CompileAsC</CompileAs>
108 108
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -111,6 +154,7 @@
111 111
       <SubSystem>Console</SubSystem>
112 112
       <GenerateDebugInformation>true</GenerateDebugInformation>
113 113
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114
+      <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>
114 115
     </Link>
115 116
   </ItemDefinitionGroup>
116 117
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -120,7 +164,28 @@
120 120
       <Optimization>MaxSpeed</Optimization>
121 121
       <FunctionLevelLinking>true</FunctionLevelLinking>
122 122
       <IntrinsicFunctions>true</IntrinsicFunctions>
123
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;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)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
125
+      <CompileAs>CompileAsC</CompileAs>
126
+      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
127
+    </ClCompile>
128
+    <Link>
129
+      <SubSystem>Console</SubSystem>
130
+      <GenerateDebugInformation>true</GenerateDebugInformation>
131
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
132
+      <OptimizeReferences>true</OptimizeReferences>
133
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
134
+      <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>
135
+    </Link>
136
+  </ItemDefinitionGroup>
137
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
138
+    <ClCompile>
139
+      <WarningLevel>Level3</WarningLevel>
140
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
141
+      <Optimization>MaxSpeed</Optimization>
142
+      <FunctionLevelLinking>true</FunctionLevelLinking>
143
+      <IntrinsicFunctions>true</IntrinsicFunctions>
144
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124 145
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
125 146
       <CompileAs>CompileAsC</CompileAs>
126 147
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
... ...
@@ -131,6 +196,7 @@
131 131
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
132 132
       <OptimizeReferences>true</OptimizeReferences>
133 133
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
134
+      <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>
134 135
     </Link>
135 136
   </ItemDefinitionGroup>
136 137
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -140,7 +206,28 @@
140 140
       <Optimization>MaxSpeed</Optimization>
141 141
       <FunctionLevelLinking>true</FunctionLevelLinking>
142 142
       <IntrinsicFunctions>true</IntrinsicFunctions>
143
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
145
+      <CompileAs>CompileAsC</CompileAs>
146
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
147
+    </ClCompile>
148
+    <Link>
149
+      <SubSystem>Console</SubSystem>
150
+      <GenerateDebugInformation>true</GenerateDebugInformation>
151
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
152
+      <OptimizeReferences>true</OptimizeReferences>
153
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
154
+      <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>
155
+    </Link>
156
+  </ItemDefinitionGroup>
157
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
158
+    <ClCompile>
159
+      <WarningLevel>Level3</WarningLevel>
160
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
161
+      <Optimization>MaxSpeed</Optimization>
162
+      <FunctionLevelLinking>true</FunctionLevelLinking>
163
+      <IntrinsicFunctions>true</IntrinsicFunctions>
164
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144 165
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
145 166
       <CompileAs>CompileAsC</CompileAs>
146 167
       <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
... ...
@@ -151,6 +238,7 @@
151 151
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
152 152
       <OptimizeReferences>true</OptimizeReferences>
153 153
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
154
+      <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>
154 155
     </Link>
155 156
   </ItemDefinitionGroup>
156 157
   <ItemGroup>
... ...
@@ -32,6 +32,7 @@
32 32
 
33 33
 void fix_paths(void);
34 34
 
35
+#ifndef LIBCLAMAV_STATIC
35 36
 BOOL APIENTRY DllMain(HMODULE hm, DWORD why, LPVOID rsrv) {
36 37
     WSADATA wsa;
37 38
     switch (why) {
... ...
@@ -57,6 +58,7 @@ BOOL APIENTRY DllMain(HMODULE hm, DWORD why, LPVOID rsrv) {
57 57
 	break;
58 58
     }
59 59
 }
60
+#endif
60 61
 
61 62
 /*
62 63
     The trick is:
... ...
@@ -1,42 +1,46 @@
1
-/*
2
- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
3
- *  Copyright (C) 2009 Sourcefire, Inc.
4
- *
5
- *  Authors: aCaB <acab@clamav.net>
6
- *
7
- *  This program is free software; you can redistribute it and/or modify
8
- *  it under the terms of the GNU General Public License version 2 as
9
- *  published by the Free Software Foundation.
10
- *
11
- *  This program is distributed in the hope that it will be useful,
12
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- *  GNU General Public License for more details.
15
- *
16
- *  You should have received a copy of the GNU General Public License
17
- *  along with this program; if not, write to the Free Software
18
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
- *  MA 02110-1301, USA.
20
- */
21
-
22
-#if HAVE_CONFIG_H
23
-#include "clamav-config.h"
24
-#endif
25
-
26
-#include <stdio.h>
27
-#include <stdarg.h>
28
-#include <errno.h>
29
-#include "snprintf.h"
30
-
31
-int snprintf(char *str, size_t size, const char *format, ...) {
32
-	va_list va;
33
-	int len;
34
-
1
+/*
2
+ *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
3
+ *  Copyright (C) 2009 Sourcefire, Inc.
4
+ *
5
+ *  Authors: aCaB <acab@clamav.net>
6
+ *
7
+ *  This program is free software; you can redistribute it and/or modify
8
+ *  it under the terms of the GNU General Public License version 2 as
9
+ *  published by the Free Software Foundation.
10
+ *
11
+ *  This program is distributed in the hope that it will be useful,
12
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
+ *  GNU General Public License for more details.
15
+ *
16
+ *  You should have received a copy of the GNU General Public License
17
+ *  along with this program; if not, write to the Free Software
18
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
+ *  MA 02110-1301, USA.
20
+ */
21
+
22
+#if HAVE_CONFIG_H
23
+#include "clamav-config.h"
24
+#endif
25
+
26
+#include <stdio.h>
27
+#include <stdarg.h>
28
+#include <errno.h>
29
+#include "snprintf.h"
30
+
31
+#ifndef HAVE_SNPRINTF
32
+
33
+int snprintf(char *str, size_t size, const char *format, ...) {
34
+	va_list va;
35
+	int len;
36
+
35 37
 	va_start(va, format);
36 38
 	errno = 0;
37 39
 	len = vsnprintf(str, size, format, va);
38 40
 	if(len == -1 && errno == ERANGE) 
39 41
 		len = size;
40
-	va_end(va);
41
-	return len;
42
-}
43 42
\ No newline at end of file
43
+	va_end(va);
44
+	return len;
45
+}
46
+
47
+#endif
44 48
\ No newline at end of file
... ...
@@ -22,6 +22,10 @@
22 22
 #ifndef __SNPRINTF_H
23 23
 #define __SNPRINTF_H
24 24
 
25
+#ifndef HAVE_SNPRINTF
26
+
25 27
 int snprintf(char *str, size_t size, const char *format, ...);
26 28
 
29
+#endif
30
+
27 31
 #endif /* __SNPRINTF_H */
28 32
\ No newline at end of file
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>Application</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>Application</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>Application</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>Application</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>Application</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings>
... ...
@@ -95,7 +137,7 @@
95 95
     <Link>
96 96
       <SubSystem>Console</SubSystem>
97 97
       <GenerateDebugInformation>true</GenerateDebugInformation>
98
-      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
98
+      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
99 99
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100 100
     </Link>
101 101
   </ItemDefinitionGroup>
... ...
@@ -104,7 +146,7 @@
104 104
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
105 105
       <WarningLevel>Level3</WarningLevel>
106 106
       <Optimization>Disabled</Optimization>
107
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108 108
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
109 109
       <CompileAs>CompileAsC</CompileAs>
110 110
       <DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings>
... ...
@@ -112,7 +154,7 @@
112 112
     <Link>
113 113
       <SubSystem>Console</SubSystem>
114 114
       <GenerateDebugInformation>true</GenerateDebugInformation>
115
-      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
115
+      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
116 116
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
117 117
     </Link>
118 118
   </ItemDefinitionGroup>
... ...
@@ -123,7 +165,28 @@
123 123
       <Optimization>MaxSpeed</Optimization>
124 124
       <FunctionLevelLinking>true</FunctionLevelLinking>
125 125
       <IntrinsicFunctions>true</IntrinsicFunctions>
126
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
128
+      <CompileAs>CompileAsC</CompileAs>
129
+      <DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings>
130
+    </ClCompile>
131
+    <Link>
132
+      <SubSystem>Console</SubSystem>
133
+      <GenerateDebugInformation>true</GenerateDebugInformation>
134
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
135
+      <OptimizeReferences>true</OptimizeReferences>
136
+      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
137
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138
+    </Link>
139
+  </ItemDefinitionGroup>
140
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
141
+    <ClCompile>
142
+      <WarningLevel>Level3</WarningLevel>
143
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
144
+      <Optimization>MaxSpeed</Optimization>
145
+      <FunctionLevelLinking>true</FunctionLevelLinking>
146
+      <IntrinsicFunctions>true</IntrinsicFunctions>
147
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127 148
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
128 149
       <CompileAs>CompileAsC</CompileAs>
129 150
       <DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings>
... ...
@@ -133,7 +196,7 @@
133 133
       <GenerateDebugInformation>true</GenerateDebugInformation>
134 134
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
135 135
       <OptimizeReferences>true</OptimizeReferences>
136
-      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
136
+      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
137 137
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138 138
     </Link>
139 139
   </ItemDefinitionGroup>
... ...
@@ -144,7 +207,28 @@
144 144
       <Optimization>MaxSpeed</Optimization>
145 145
       <FunctionLevelLinking>true</FunctionLevelLinking>
146 146
       <IntrinsicFunctions>true</IntrinsicFunctions>
147
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
149
+      <CompileAs>CompileAsC</CompileAs>
150
+      <DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings>
151
+    </ClCompile>
152
+    <Link>
153
+      <SubSystem>Console</SubSystem>
154
+      <GenerateDebugInformation>true</GenerateDebugInformation>
155
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
156
+      <OptimizeReferences>true</OptimizeReferences>
157
+      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
158
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
159
+    </Link>
160
+  </ItemDefinitionGroup>
161
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
162
+    <ClCompile>
163
+      <WarningLevel>Level3</WarningLevel>
164
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
165
+      <Optimization>MaxSpeed</Optimization>
166
+      <FunctionLevelLinking>true</FunctionLevelLinking>
167
+      <IntrinsicFunctions>true</IntrinsicFunctions>
168
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148 169
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
149 170
       <CompileAs>CompileAsC</CompileAs>
150 171
       <DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings>
... ...
@@ -154,7 +238,7 @@
154 154
       <GenerateDebugInformation>true</GenerateDebugInformation>
155 155
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
156 156
       <OptimizeReferences>true</OptimizeReferences>
157
-      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
157
+      <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
158 158
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
159 159
     </Link>
160 160
   </ItemDefinitionGroup>
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>DynamicLibrary</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>DynamicLibrary</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>DynamicLibrary</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>DynamicLibrary</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>StaticLibrary</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <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>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
... ...
@@ -105,7 +147,7 @@
105 105
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
106 106
       <WarningLevel>Level3</WarningLevel>
107 107
       <Optimization>Disabled</Optimization>
108
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108
+      <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>
109 109
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
110 110
       <CompileAs>CompileAsC</CompileAs>
111 111
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
... ...
@@ -125,7 +167,29 @@
125 125
       <Optimization>MaxSpeed</Optimization>
126 126
       <FunctionLevelLinking>true</FunctionLevelLinking>
127 127
       <IntrinsicFunctions>true</IntrinsicFunctions>
128
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128
+      <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>
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)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
130
+      <CompileAs>CompileAsC</CompileAs>
131
+      <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
132
+    </ClCompile>
133
+    <Link>
134
+      <SubSystem>Windows</SubSystem>
135
+      <GenerateDebugInformation>true</GenerateDebugInformation>
136
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
137
+      <OptimizeReferences>true</OptimizeReferences>
138
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
139
+      <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
140
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141
+    </Link>
142
+  </ItemDefinitionGroup>
143
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
144
+    <ClCompile>
145
+      <WarningLevel>Level3</WarningLevel>
146
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
147
+      <Optimization>MaxSpeed</Optimization>
148
+      <FunctionLevelLinking>true</FunctionLevelLinking>
149
+      <IntrinsicFunctions>true</IntrinsicFunctions>
150
+      <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>
129 151
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
130 152
       <CompileAs>CompileAsC</CompileAs>
131 153
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
... ...
@@ -147,10 +211,33 @@
147 147
       <Optimization>MaxSpeed</Optimization>
148 148
       <FunctionLevelLinking>true</FunctionLevelLinking>
149 149
       <IntrinsicFunctions>true</IntrinsicFunctions>
150
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150
+      <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>
151
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
152
+      <CompileAs>CompileAsC</CompileAs>
153
+      <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
154
+    </ClCompile>
155
+    <Link>
156
+      <SubSystem>Windows</SubSystem>
157
+      <GenerateDebugInformation>true</GenerateDebugInformation>
158
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
159
+      <OptimizeReferences>true</OptimizeReferences>
160
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
161
+      <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
162
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
163
+    </Link>
164
+  </ItemDefinitionGroup>
165
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
166
+    <ClCompile>
167
+      <WarningLevel>Level3</WarningLevel>
168
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
169
+      <Optimization>MaxSpeed</Optimization>
170
+      <FunctionLevelLinking>true</FunctionLevelLinking>
171
+      <IntrinsicFunctions>true</IntrinsicFunctions>
172
+      <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>
151 173
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
152 174
       <CompileAs>CompileAsC</CompileAs>
153 175
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267;4334</DisableSpecificWarnings>
176
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
154 177
     </ClCompile>
155 178
     <Link>
156 179
       <SubSystem>Windows</SubSystem>
... ...
@@ -161,6 +248,9 @@
161 161
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
162 162
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
163 163
     </Link>
164
+    <Lib>
165
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
166
+    </Lib>
164 167
   </ItemDefinitionGroup>
165 168
   <ItemGroup>
166 169
     <None Include="libclamav.def" />
... ...
@@ -324,8 +414,10 @@
324 324
     <ClCompile Include="..\libclamav\dmg.c">
325 325
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
326 326
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
327
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
327 328
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
328 329
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
330
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
329 331
     </ClCompile>
330 332
     <ClCompile Include="..\libclamav\dsig.c" />
331 333
     <ClCompile Include="..\libclamav\elf.c" />
... ...
@@ -365,7 +457,9 @@
365 365
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\nsis_bzlib</ObjectFileName>
366 366
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\nsis_bzlib</ObjectFileName>
367 367
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\nsis_bzlib</ObjectFileName>
368
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">$(IntDir)\nsis_bzlib</ObjectFileName>
368 369
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\nsis_bzlib</ObjectFileName>
370
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">$(IntDir)\nsis_bzlib.obj</ObjectFileName>
369 371
     </ClCompile>
370 372
     <ClCompile Include="..\libclamav\nsis\infblock.c" />
371 373
     <ClCompile Include="..\libclamav\nsis\nulsft.c" />
... ...
@@ -414,8 +508,10 @@
414 414
     <ClCompile Include="..\libclamav\xar.c">
415 415
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
416 416
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
417
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
417 418
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
418 419
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
420
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">/D "LIBXML_STATIC" %(AdditionalOptions)</AdditionalOptions>
419 421
     </ClCompile>
420 422
     <ClCompile Include="..\libclamav\www.c" />
421 423
     <ClCompile Include="..\libclamav\xdp.c" />
... ...
@@ -435,13 +531,17 @@
435 435
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\bzip2_bzlib</ObjectFileName>
436 436
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\bzip2_bzlib</ObjectFileName>
437 437
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\bzip2_bzlib</ObjectFileName>
438
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">$(IntDir)\bzip2_bzlib</ObjectFileName>
438 439
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\bzip2_bzlib</ObjectFileName>
440
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">$(IntDir)\bzip2_bzlib.obj</ObjectFileName>
439 441
     </ClCompile>
440 442
     <ClCompile Include="3rdparty\bzip2\compress.c">
441 443
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\compress_bzip2</ObjectFileName>
442 444
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\compress_bzip2</ObjectFileName>
443 445
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\compress_bzip2</ObjectFileName>
446
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">$(IntDir)\compress_bzip2</ObjectFileName>
444 447
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\compress_bzip2</ObjectFileName>
448
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">$(IntDir)\compress_bzip2.obj</ObjectFileName>
445 449
     </ClCompile>
446 450
     <ClCompile Include="3rdparty\bzip2\crctable.c" />
447 451
     <ClCompile Include="3rdparty\bzip2\decompress.c" />
... ...
@@ -496,7 +596,9 @@
496 496
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\compress_zlib</ObjectFileName>
497 497
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\compress_zlib</ObjectFileName>
498 498
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\compress_zlib</ObjectFileName>
499
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">$(IntDir)\compress_zlib</ObjectFileName>
499 500
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\compress_zlib</ObjectFileName>
501
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">$(IntDir)\compress_zlib.obj</ObjectFileName>
500 502
     </ClCompile>
501 503
     <ClCompile Include="3rdparty\zlib\crc32.c" />
502 504
     <ClCompile Include="3rdparty\zlib\deflate.c" />
... ...
@@ -543,7 +645,6 @@
543 543
   </ItemGroup>
544 544
   <ItemGroup>
545 545
     <ClInclude Include="..\libclamav\hostid.h" />
546
-    <ClInclude Include="..\libclamav\hwp.h" />
547 546
     <ClInclude Include="..\libclamav\stats.h" />
548 547
     <ClInclude Include="..\libclamav\www.h" />
549 548
     <ClInclude Include="..\libclamav\xdp.h" />
... ...
@@ -1037,9 +1037,6 @@
1037 1037
     <ClInclude Include="..\libclamav\xdp.h">
1038 1038
       <Filter>Source Files</Filter>
1039 1039
     </ClInclude>
1040
-    <ClInclude Include="..\libclamav\hwp.h">
1041
-      <Filter>Source Files</Filter>
1042
-    </ClInclude>
1043 1040
   </ItemGroup>
1044 1041
   <ItemGroup>
1045 1042
     <Library Include="libeay32.lib" />
... ...
@@ -1,158 +1,237 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <ItemGroup Label="ProjectConfigurations">
4
-    <ProjectConfiguration Include="Debug|Win32">
5
-      <Configuration>Debug</Configuration>
6
-      <Platform>Win32</Platform>
7
-    </ProjectConfiguration>
8
-    <ProjectConfiguration Include="Debug|x64">
9
-      <Configuration>Debug</Configuration>
10
-      <Platform>x64</Platform>
11
-    </ProjectConfiguration>
12
-    <ProjectConfiguration Include="Release|Win32">
13
-      <Configuration>Release</Configuration>
14
-      <Platform>Win32</Platform>
15
-    </ProjectConfiguration>
16
-    <ProjectConfiguration Include="Release|x64">
17
-      <Configuration>Release</Configuration>
18
-      <Platform>x64</Platform>
19
-    </ProjectConfiguration>
20
-  </ItemGroup>
21
-  <ItemGroup>
22
-    <ClCompile Include="..\libclamav\c++\PointerTracking.cpp" />
23
-    <ClCompile Include="..\libclamav\c++\detect.cpp" />
24
-    <ClCompile Include="..\libclamav\c++\bytecode2llvm.cpp" />
25
-    <ClCompile Include="..\libclamav\c++\ClamBCRTChecks.cpp" />
26
-  </ItemGroup>
27
-  <PropertyGroup Label="Globals">
28
-    <ProjectGuid>{3AE8051D-A188-4B11-95A4-14B8F0C290CB}</ProjectGuid>
29
-    <Keyword>Win32Proj</Keyword>
30
-    <RootNamespace>libclamavcxx</RootNamespace>
31
-  </PropertyGroup>
32
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
33
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34
-    <ConfigurationType>StaticLibrary</ConfigurationType>
35
-    <UseDebugLibraries>true</UseDebugLibraries>
36
-    <CharacterSet>MultiByte</CharacterSet>
37
-  </PropertyGroup>
38
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
39
-    <ConfigurationType>StaticLibrary</ConfigurationType>
40
-    <UseDebugLibraries>true</UseDebugLibraries>
41
-    <CharacterSet>MultiByte</CharacterSet>
42
-  </PropertyGroup>
43
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
44
-    <ConfigurationType>StaticLibrary</ConfigurationType>
45
-    <UseDebugLibraries>false</UseDebugLibraries>
46
-    <WholeProgramOptimization>true</WholeProgramOptimization>
47
-    <CharacterSet>MultiByte</CharacterSet>
48
-  </PropertyGroup>
49
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
50
-    <ConfigurationType>StaticLibrary</ConfigurationType>
51
-    <UseDebugLibraries>false</UseDebugLibraries>
52
-    <WholeProgramOptimization>true</WholeProgramOptimization>
53
-    <CharacterSet>MultiByte</CharacterSet>
54
-  </PropertyGroup>
55
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
56
-  <ImportGroup Label="ExtensionSettings">
57
-  </ImportGroup>
58
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
59
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60
-  </ImportGroup>
61
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
62
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63
-  </ImportGroup>
64
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
65
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
66
-  </ImportGroup>
67
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
68
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
69
-  </ImportGroup>
70
-  <PropertyGroup Label="UserMacros" />
71
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
72
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
73
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
74
-  </PropertyGroup>
75
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
76
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
77
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
78
-  </PropertyGroup>
79
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
80
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
81
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
82
-  </PropertyGroup>
83
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
84
-    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
85
-    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
86
-  </PropertyGroup>
87
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
88
-    <ClCompile>
89
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
90
-      <WarningLevel>Level3</WarningLevel>
91
-      <Optimization>Disabled</Optimization>
92
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93
-      <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>
94
-      <CompileAs>CompileAsCpp</CompileAs>
95
-      <DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings>
96
-    </ClCompile>
97
-    <Link>
98
-      <SubSystem>Windows</SubSystem>
99
-      <GenerateDebugInformation>true</GenerateDebugInformation>
100
-    </Link>
101
-  </ItemDefinitionGroup>
102
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
103
-    <ClCompile>
104
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
105
-      <WarningLevel>Level3</WarningLevel>
106
-      <Optimization>Disabled</Optimization>
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;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
109
-      <CompileAs>CompileAsCpp</CompileAs>
110
-      <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
111
-    </ClCompile>
112
-    <Link>
113
-      <SubSystem>Windows</SubSystem>
114
-      <GenerateDebugInformation>true</GenerateDebugInformation>
115
-    </Link>
116
-  </ItemDefinitionGroup>
117
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
118
-    <ClCompile>
119
-      <WarningLevel>Level3</WarningLevel>
120
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
121
-      <Optimization>MaxSpeed</Optimization>
122
-      <FunctionLevelLinking>true</FunctionLevelLinking>
123
-      <IntrinsicFunctions>true</IntrinsicFunctions>
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;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126
-      <CompileAs>CompileAsCpp</CompileAs>
127
-      <DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings>
128
-    </ClCompile>
129
-    <Link>
130
-      <SubSystem>Windows</SubSystem>
131
-      <GenerateDebugInformation>true</GenerateDebugInformation>
132
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
133
-      <OptimizeReferences>true</OptimizeReferences>
134
-    </Link>
135
-  </ItemDefinitionGroup>
136
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
137
-    <ClCompile>
138
-      <WarningLevel>Level3</WarningLevel>
139
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
140
-      <Optimization>MaxSpeed</Optimization>
141
-      <FunctionLevelLinking>true</FunctionLevelLinking>
142
-      <IntrinsicFunctions>true</IntrinsicFunctions>
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;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
145
-      <CompileAs>CompileAsCpp</CompileAs>
146
-      <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
147
-    </ClCompile>
148
-    <Link>
149
-      <SubSystem>Windows</SubSystem>
150
-      <GenerateDebugInformation>true</GenerateDebugInformation>
151
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
152
-      <OptimizeReferences>true</OptimizeReferences>
153
-    </Link>
154
-  </ItemDefinitionGroup>
155
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
156
-  <ImportGroup Label="ExtensionTargets">
157
-  </ImportGroup>
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ItemGroup Label="ProjectConfigurations">
4
+    <ProjectConfiguration Include="Debug|Win32">
5
+      <Configuration>Debug</Configuration>
6
+      <Platform>Win32</Platform>
7
+    </ProjectConfiguration>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
11
+    </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
20
+    <ProjectConfiguration Include="Release|Win32">
21
+      <Configuration>Release</Configuration>
22
+      <Platform>Win32</Platform>
23
+    </ProjectConfiguration>
24
+    <ProjectConfiguration Include="Release|x64">
25
+      <Configuration>Release</Configuration>
26
+      <Platform>x64</Platform>
27
+    </ProjectConfiguration>
28
+  </ItemGroup>
29
+  <ItemGroup>
30
+    <ClCompile Include="..\libclamav\c++\PointerTracking.cpp" />
31
+    <ClCompile Include="..\libclamav\c++\detect.cpp" />
32
+    <ClCompile Include="..\libclamav\c++\bytecode2llvm.cpp" />
33
+    <ClCompile Include="..\libclamav\c++\ClamBCRTChecks.cpp" />
34
+  </ItemGroup>
35
+  <PropertyGroup Label="Globals">
36
+    <ProjectGuid>{3AE8051D-A188-4B11-95A4-14B8F0C290CB}</ProjectGuid>
37
+    <Keyword>Win32Proj</Keyword>
38
+    <RootNamespace>libclamavcxx</RootNamespace>
39
+  </PropertyGroup>
40
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
41
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
42
+    <ConfigurationType>StaticLibrary</ConfigurationType>
43
+    <UseDebugLibraries>true</UseDebugLibraries>
44
+    <CharacterSet>MultiByte</CharacterSet>
45
+    <PlatformToolset>v140</PlatformToolset>
46
+  </PropertyGroup>
47
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
48
+    <ConfigurationType>StaticLibrary</ConfigurationType>
49
+    <UseDebugLibraries>true</UseDebugLibraries>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
52
+  </PropertyGroup>
53
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
54
+    <ConfigurationType>StaticLibrary</ConfigurationType>
55
+    <UseDebugLibraries>false</UseDebugLibraries>
56
+    <WholeProgramOptimization>true</WholeProgramOptimization>
57
+    <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
61
+    <ConfigurationType>StaticLibrary</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
66
+  </PropertyGroup>
67
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
68
+    <ConfigurationType>StaticLibrary</ConfigurationType>
69
+    <UseDebugLibraries>false</UseDebugLibraries>
70
+    <WholeProgramOptimization>true</WholeProgramOptimization>
71
+    <CharacterSet>MultiByte</CharacterSet>
72
+    <PlatformToolset>v140</PlatformToolset>
73
+  </PropertyGroup>
74
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
75
+    <ConfigurationType>StaticLibrary</ConfigurationType>
76
+    <UseDebugLibraries>false</UseDebugLibraries>
77
+    <WholeProgramOptimization>true</WholeProgramOptimization>
78
+    <CharacterSet>MultiByte</CharacterSet>
79
+    <PlatformToolset>v140</PlatformToolset>
80
+  </PropertyGroup>
81
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
82
+  <ImportGroup Label="ExtensionSettings">
83
+  </ImportGroup>
84
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
85
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
86
+  </ImportGroup>
87
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
88
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
89
+  </ImportGroup>
90
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
91
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
92
+  </ImportGroup>
93
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
94
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
95
+  </ImportGroup>
96
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
97
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
98
+  </ImportGroup>
99
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
100
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
101
+  </ImportGroup>
102
+  <PropertyGroup Label="UserMacros" />
103
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
104
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
105
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
106
+  </PropertyGroup>
107
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
108
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
109
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
110
+  </PropertyGroup>
111
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
112
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
113
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
114
+  </PropertyGroup>
115
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
116
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
117
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
118
+  </PropertyGroup>
119
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
120
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
121
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
122
+  </PropertyGroup>
123
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
124
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
125
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
126
+  </PropertyGroup>
127
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
128
+    <ClCompile>
129
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
130
+      <WarningLevel>Level3</WarningLevel>
131
+      <Optimization>Disabled</Optimization>
132
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
134
+      <CompileAs>CompileAsCpp</CompileAs>
135
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings>
136
+    </ClCompile>
137
+    <Link>
138
+      <SubSystem>Windows</SubSystem>
139
+      <GenerateDebugInformation>true</GenerateDebugInformation>
140
+    </Link>
141
+  </ItemDefinitionGroup>
142
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
143
+    <ClCompile>
144
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
145
+      <WarningLevel>Level3</WarningLevel>
146
+      <Optimization>Disabled</Optimization>
147
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
149
+      <CompileAs>CompileAsCpp</CompileAs>
150
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
151
+    </ClCompile>
152
+    <Link>
153
+      <SubSystem>Windows</SubSystem>
154
+      <GenerateDebugInformation>true</GenerateDebugInformation>
155
+    </Link>
156
+  </ItemDefinitionGroup>
157
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
158
+    <ClCompile>
159
+      <WarningLevel>Level3</WarningLevel>
160
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
161
+      <Optimization>MaxSpeed</Optimization>
162
+      <FunctionLevelLinking>true</FunctionLevelLinking>
163
+      <IntrinsicFunctions>true</IntrinsicFunctions>
164
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
166
+      <CompileAs>CompileAsCpp</CompileAs>
167
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings>
168
+    </ClCompile>
169
+    <Link>
170
+      <SubSystem>Windows</SubSystem>
171
+      <GenerateDebugInformation>true</GenerateDebugInformation>
172
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
173
+      <OptimizeReferences>true</OptimizeReferences>
174
+    </Link>
175
+  </ItemDefinitionGroup>
176
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
177
+    <ClCompile>
178
+      <WarningLevel>Level3</WarningLevel>
179
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
180
+      <Optimization>MaxSpeed</Optimization>
181
+      <FunctionLevelLinking>true</FunctionLevelLinking>
182
+      <IntrinsicFunctions>true</IntrinsicFunctions>
183
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
185
+      <CompileAs>CompileAsCpp</CompileAs>
186
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings>
187
+    </ClCompile>
188
+    <Link>
189
+      <SubSystem>Windows</SubSystem>
190
+      <GenerateDebugInformation>true</GenerateDebugInformation>
191
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
192
+      <OptimizeReferences>true</OptimizeReferences>
193
+    </Link>
194
+  </ItemDefinitionGroup>
195
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
196
+    <ClCompile>
197
+      <WarningLevel>Level3</WarningLevel>
198
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
199
+      <Optimization>MaxSpeed</Optimization>
200
+      <FunctionLevelLinking>true</FunctionLevelLinking>
201
+      <IntrinsicFunctions>true</IntrinsicFunctions>
202
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
203
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
204
+      <CompileAs>CompileAsCpp</CompileAs>
205
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
206
+    </ClCompile>
207
+    <Link>
208
+      <SubSystem>Windows</SubSystem>
209
+      <GenerateDebugInformation>true</GenerateDebugInformation>
210
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
211
+      <OptimizeReferences>true</OptimizeReferences>
212
+    </Link>
213
+  </ItemDefinitionGroup>
214
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
215
+    <ClCompile>
216
+      <WarningLevel>Level3</WarningLevel>
217
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
218
+      <Optimization>MaxSpeed</Optimization>
219
+      <FunctionLevelLinking>true</FunctionLevelLinking>
220
+      <IntrinsicFunctions>true</IntrinsicFunctions>
221
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
222
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
223
+      <CompileAs>CompileAsCpp</CompileAs>
224
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
225
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
226
+    </ClCompile>
227
+    <Link>
228
+      <SubSystem>Windows</SubSystem>
229
+      <GenerateDebugInformation>true</GenerateDebugInformation>
230
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
231
+      <OptimizeReferences>true</OptimizeReferences>
232
+    </Link>
233
+  </ItemDefinitionGroup>
234
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
235
+  <ImportGroup Label="ExtensionTargets">
236
+  </ImportGroup>
158 237
 </Project>
159 238
\ No newline at end of file
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>DynamicLibrary</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>DynamicLibrary</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>DynamicLibrary</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>DynamicLibrary</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <DisableSpecificWarnings>4996;4018;4146;4244</DisableSpecificWarnings>
93 103
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -104,7 +146,7 @@
104 104
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
105 105
       <WarningLevel>Level3</WarningLevel>
106 106
       <Optimization>Disabled</Optimization>
107
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108 108
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
109 109
       <DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings>
110 110
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -123,7 +165,28 @@
123 123
       <Optimization>MaxSpeed</Optimization>
124 124
       <FunctionLevelLinking>true</FunctionLevelLinking>
125 125
       <IntrinsicFunctions>true</IntrinsicFunctions>
126
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
128
+      <DisableSpecificWarnings>4996;4018;4146;4244</DisableSpecificWarnings>
129
+      <CompileAs>CompileAsC</CompileAs>
130
+    </ClCompile>
131
+    <Link>
132
+      <SubSystem>Windows</SubSystem>
133
+      <GenerateDebugInformation>true</GenerateDebugInformation>
134
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
135
+      <OptimizeReferences>true</OptimizeReferences>
136
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
137
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138
+    </Link>
139
+  </ItemDefinitionGroup>
140
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
141
+    <ClCompile>
142
+      <WarningLevel>Level3</WarningLevel>
143
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
144
+      <Optimization>MaxSpeed</Optimization>
145
+      <FunctionLevelLinking>true</FunctionLevelLinking>
146
+      <IntrinsicFunctions>true</IntrinsicFunctions>
147
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127 148
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
128 149
       <DisableSpecificWarnings>4996;4018;4146;4244</DisableSpecificWarnings>
129 150
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -144,7 +207,28 @@
144 144
       <Optimization>MaxSpeed</Optimization>
145 145
       <FunctionLevelLinking>true</FunctionLevelLinking>
146 146
       <IntrinsicFunctions>true</IntrinsicFunctions>
147
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
149
+      <DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings>
150
+      <CompileAs>CompileAsC</CompileAs>
151
+    </ClCompile>
152
+    <Link>
153
+      <SubSystem>Windows</SubSystem>
154
+      <GenerateDebugInformation>true</GenerateDebugInformation>
155
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
156
+      <OptimizeReferences>true</OptimizeReferences>
157
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
158
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
159
+    </Link>
160
+  </ItemDefinitionGroup>
161
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
162
+    <ClCompile>
163
+      <WarningLevel>Level3</WarningLevel>
164
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
165
+      <Optimization>MaxSpeed</Optimization>
166
+      <FunctionLevelLinking>true</FunctionLevelLinking>
167
+      <IntrinsicFunctions>true</IntrinsicFunctions>
168
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148 169
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
149 170
       <DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings>
150 171
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>DynamicLibrary</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>DynamicLibrary</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>DynamicLibrary</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>DynamicLibrary</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
78 78
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83 88
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
93
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
93 103
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -106,7 +148,7 @@
106 106
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
107 107
       <WarningLevel>Level3</WarningLevel>
108 108
       <Optimization>Disabled</Optimization>
109
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
110 110
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
111 111
       <DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
112 112
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -127,7 +169,30 @@
127 127
       <Optimization>MaxSpeed</Optimization>
128 128
       <FunctionLevelLinking>true</FunctionLevelLinking>
129 129
       <IntrinsicFunctions>true</IntrinsicFunctions>
130
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
132
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
133
+      <CompileAs>CompileAsC</CompileAs>
134
+    </ClCompile>
135
+    <Link>
136
+      <SubSystem>Windows</SubSystem>
137
+      <GenerateDebugInformation>true</GenerateDebugInformation>
138
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
139
+      <OptimizeReferences>true</OptimizeReferences>
140
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
141
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
142
+    </Link>
143
+    <ProjectReference />
144
+    <ProjectReference />
145
+  </ItemDefinitionGroup>
146
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
147
+    <ClCompile>
148
+      <WarningLevel>Level3</WarningLevel>
149
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
150
+      <Optimization>MaxSpeed</Optimization>
151
+      <FunctionLevelLinking>true</FunctionLevelLinking>
152
+      <IntrinsicFunctions>true</IntrinsicFunctions>
153
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131 154
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
132 155
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
133 156
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -150,7 +215,30 @@
150 150
       <Optimization>MaxSpeed</Optimization>
151 151
       <FunctionLevelLinking>true</FunctionLevelLinking>
152 152
       <IntrinsicFunctions>true</IntrinsicFunctions>
153
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
155
+      <DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
156
+      <CompileAs>CompileAsC</CompileAs>
157
+    </ClCompile>
158
+    <Link>
159
+      <SubSystem>Windows</SubSystem>
160
+      <GenerateDebugInformation>true</GenerateDebugInformation>
161
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
162
+      <OptimizeReferences>true</OptimizeReferences>
163
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
164
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
165
+    </Link>
166
+    <ProjectReference />
167
+    <ProjectReference />
168
+  </ItemDefinitionGroup>
169
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
170
+    <ClCompile>
171
+      <WarningLevel>Level3</WarningLevel>
172
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
173
+      <Optimization>MaxSpeed</Optimization>
174
+      <FunctionLevelLinking>true</FunctionLevelLinking>
175
+      <IntrinsicFunctions>true</IntrinsicFunctions>
176
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154 177
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
155 178
       <DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
156 179
       <CompileAs>CompileAsC</CompileAs>
... ...
@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
... ...
@@ -9,6 +9,14 @@
9 9
       <Configuration>Debug</Configuration>
10 10
       <Platform>x64</Platform>
11 11
     </ProjectConfiguration>
12
+    <ProjectConfiguration Include="Release-Static|Win32">
13
+      <Configuration>Release-Static</Configuration>
14
+      <Platform>Win32</Platform>
15
+    </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release-Static|x64">
17
+      <Configuration>Release-Static</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
     <ProjectConfiguration Include="Release|Win32">
13 21
       <Configuration>Release</Configuration>
14 22
       <Platform>Win32</Platform>
... ...
@@ -28,23 +36,41 @@
28 28
     <ConfigurationType>Application</ConfigurationType>
29 29
     <UseDebugLibraries>true</UseDebugLibraries>
30 30
     <CharacterSet>MultiByte</CharacterSet>
31
+    <PlatformToolset>v140</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35 36
     <CharacterSet>MultiByte</CharacterSet>
37
+    <PlatformToolset>v140</PlatformToolset>
36 38
   </PropertyGroup>
37 39
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 40
     <ConfigurationType>Application</ConfigurationType>
39 41
     <UseDebugLibraries>false</UseDebugLibraries>
40 42
     <WholeProgramOptimization>true</WholeProgramOptimization>
41 43
     <CharacterSet>MultiByte</CharacterSet>
44
+    <PlatformToolset>v140</PlatformToolset>
45
+  </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
47
+    <ConfigurationType>Application</ConfigurationType>
48
+    <UseDebugLibraries>false</UseDebugLibraries>
49
+    <WholeProgramOptimization>true</WholeProgramOptimization>
50
+    <CharacterSet>MultiByte</CharacterSet>
51
+    <PlatformToolset>v140</PlatformToolset>
42 52
   </PropertyGroup>
43 53
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 54
     <ConfigurationType>Application</ConfigurationType>
45 55
     <UseDebugLibraries>false</UseDebugLibraries>
46 56
     <WholeProgramOptimization>true</WholeProgramOptimization>
47 57
     <CharacterSet>MultiByte</CharacterSet>
58
+    <PlatformToolset>v140</PlatformToolset>
59
+  </PropertyGroup>
60
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
61
+    <ConfigurationType>Application</ConfigurationType>
62
+    <UseDebugLibraries>false</UseDebugLibraries>
63
+    <WholeProgramOptimization>true</WholeProgramOptimization>
64
+    <CharacterSet>MultiByte</CharacterSet>
65
+    <PlatformToolset>v140</PlatformToolset>
48 66
   </PropertyGroup>
49 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50 68
   <ImportGroup Label="ExtensionSettings">
... ...
@@ -58,9 +84,15 @@
58 58
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
59 59
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
60 60
   </ImportGroup>
61
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
62
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
+  </ImportGroup>
61 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
63 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
68
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69
+  </ImportGroup>
64 70
   <PropertyGroup Label="UserMacros" />
65 71
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66 72
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -77,17 +109,27 @@
77 77
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
78 78
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
79 79
   </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
81
+    <LinkIncremental>false</LinkIncremental>
82
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
83
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
84
+  </PropertyGroup>
80 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81 86
     <LinkIncremental>false</LinkIncremental>
82 87
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
83 88
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
84 89
   </PropertyGroup>
90
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
91
+    <LinkIncremental>false</LinkIncremental>
92
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
93
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
94
+  </PropertyGroup>
85 95
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86 96
     <ClCompile>
87 97
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
88 98
       <WarningLevel>Level3</WarningLevel>
89 99
       <Optimization>Disabled</Optimization>
90
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91 101
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
92 102
       <CompileAs>CompileAsC</CompileAs>
93 103
       <DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings>
... ...
@@ -96,6 +138,7 @@
96 96
       <SubSystem>Console</SubSystem>
97 97
       <GenerateDebugInformation>true</GenerateDebugInformation>
98 98
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99
+      <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>
99 100
     </Link>
100 101
   </ItemDefinitionGroup>
101 102
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -103,7 +146,7 @@
103 103
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
104 104
       <WarningLevel>Level3</WarningLevel>
105 105
       <Optimization>Disabled</Optimization>
106
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107 107
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
108 108
       <CompileAs>CompileAsC</CompileAs>
109 109
       <DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings>
... ...
@@ -112,6 +155,7 @@
112 112
       <SubSystem>Console</SubSystem>
113 113
       <GenerateDebugInformation>true</GenerateDebugInformation>
114 114
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115
+      <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>
115 116
     </Link>
116 117
   </ItemDefinitionGroup>
117 118
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -121,7 +165,28 @@
121 121
       <Optimization>MaxSpeed</Optimization>
122 122
       <FunctionLevelLinking>true</FunctionLevelLinking>
123 123
       <IntrinsicFunctions>true</IntrinsicFunctions>
124
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126
+      <CompileAs>CompileAsC</CompileAs>
127
+      <DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings>
128
+    </ClCompile>
129
+    <Link>
130
+      <SubSystem>Console</SubSystem>
131
+      <GenerateDebugInformation>true</GenerateDebugInformation>
132
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
133
+      <OptimizeReferences>true</OptimizeReferences>
134
+      <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
136
+    </Link>
137
+  </ItemDefinitionGroup>
138
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
139
+    <ClCompile>
140
+      <WarningLevel>Level3</WarningLevel>
141
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
142
+      <Optimization>MaxSpeed</Optimization>
143
+      <FunctionLevelLinking>true</FunctionLevelLinking>
144
+      <IntrinsicFunctions>true</IntrinsicFunctions>
145
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125 146
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories>
126 147
       <CompileAs>CompileAsC</CompileAs>
127 148
       <DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings>
... ...
@@ -132,6 +197,7 @@
132 132
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
133 133
       <OptimizeReferences>true</OptimizeReferences>
134 134
       <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135
+      <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>
135 136
     </Link>
136 137
   </ItemDefinitionGroup>
137 138
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -141,7 +207,28 @@
141 141
       <Optimization>MaxSpeed</Optimization>
142 142
       <FunctionLevelLinking>true</FunctionLevelLinking>
143 143
       <IntrinsicFunctions>true</IntrinsicFunctions>
144
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146
+      <CompileAs>CompileAsC</CompileAs>
147
+      <DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings>
148
+    </ClCompile>
149
+    <Link>
150
+      <SubSystem>Console</SubSystem>
151
+      <GenerateDebugInformation>true</GenerateDebugInformation>
152
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
153
+      <OptimizeReferences>true</OptimizeReferences>
154
+      <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
156
+    </Link>
157
+  </ItemDefinitionGroup>
158
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
159
+    <ClCompile>
160
+      <WarningLevel>Level3</WarningLevel>
161
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
162
+      <Optimization>MaxSpeed</Optimization>
163
+      <FunctionLevelLinking>true</FunctionLevelLinking>
164
+      <IntrinsicFunctions>true</IntrinsicFunctions>
165
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145 166
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include</AdditionalIncludeDirectories>
146 167
       <CompileAs>CompileAsC</CompileAs>
147 168
       <DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings>
... ...
@@ -152,6 +239,7 @@
152 152
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
153 153
       <OptimizeReferences>true</OptimizeReferences>
154 154
       <AdditionalLibraryDirectories>C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155
+      <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>
155 156
     </Link>
156 157
   </ItemDefinitionGroup>
157 158
   <ItemGroup>