Browse code

preliominary support fot x64 target - untested!

aCaB authored on 2010/05/16 05:17:23
Showing 19 changed files
... ...
@@ -4,5 +4,5 @@ build
4 4
 *.ncb
5 5
 *.suo
6 6
 *.user
7
-Debug/*
8
-Release/*
7
+*/Debug/*
8
+*/Release/*
... ...
@@ -1,6 +1,6 @@
1 1
 
2 2
 Microsoft Visual Studio Solution File, Format Version 10.00
3
-# Visual C++ Express 2008
3
+# Visual Studio 2008
4 4
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamav", "libclamav.vcproj", "{3AD5B16C-340A-40AC-96AD-6017B941A316}"
5 5
 	ProjectSection(ProjectDependencies) = postProject
6 6
 		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7} = {F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}
... ...
@@ -64,69 +64,131 @@ EndProject
64 64
 Global
65 65
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
66 66
 		Debug|Win32 = Debug|Win32
67
+		Debug|x64 = Debug|x64
67 68
 		Release|Win32 = Release|Win32
69
+		Release|x64 = Release|x64
68 70
 	EndGlobalSection
69 71
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
70 72
 		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Debug|Win32.ActiveCfg = Debug|Win32
71 73
 		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Debug|Win32.Build.0 = Debug|Win32
74
+		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Debug|x64.ActiveCfg = Debug|x64
75
+		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Debug|x64.Build.0 = Debug|x64
72 76
 		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Release|Win32.ActiveCfg = Release|Win32
73 77
 		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Release|Win32.Build.0 = Release|Win32
78
+		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Release|x64.ActiveCfg = Release|x64
79
+		{3AD5B16C-340A-40AC-96AD-6017B941A316}.Release|x64.Build.0 = Release|x64
74 80
 		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Debug|Win32.ActiveCfg = Debug|Win32
75 81
 		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Debug|Win32.Build.0 = Debug|Win32
82
+		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Debug|x64.ActiveCfg = Debug|x64
83
+		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Debug|x64.Build.0 = Debug|x64
76 84
 		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Release|Win32.ActiveCfg = Release|Win32
77 85
 		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Release|Win32.Build.0 = Release|Win32
86
+		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Release|x64.ActiveCfg = Release|x64
87
+		{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Release|x64.Build.0 = Release|x64
78 88
 		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Debug|Win32.ActiveCfg = Debug|Win32
79 89
 		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Debug|Win32.Build.0 = Debug|Win32
90
+		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Debug|x64.ActiveCfg = Debug|x64
91
+		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Debug|x64.Build.0 = Debug|x64
80 92
 		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Release|Win32.ActiveCfg = Release|Win32
81 93
 		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Release|Win32.Build.0 = Release|Win32
94
+		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Release|x64.ActiveCfg = Release|x64
95
+		{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Release|x64.Build.0 = Release|x64
82 96
 		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Debug|Win32.ActiveCfg = Debug|Win32
83 97
 		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Debug|Win32.Build.0 = Debug|Win32
98
+		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Debug|x64.ActiveCfg = Debug|x64
99
+		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Debug|x64.Build.0 = Debug|x64
84 100
 		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|Win32.ActiveCfg = Release|Win32
85 101
 		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|Win32.Build.0 = Release|Win32
102
+		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|x64.ActiveCfg = Release|x64
103
+		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|x64.Build.0 = Release|x64
86 104
 		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Debug|Win32.ActiveCfg = Debug|Win32
87 105
 		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Debug|Win32.Build.0 = Debug|Win32
106
+		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Debug|x64.ActiveCfg = Debug|x64
107
+		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Debug|x64.Build.0 = Debug|x64
88 108
 		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Release|Win32.ActiveCfg = Release|Win32
89 109
 		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Release|Win32.Build.0 = Release|Win32
110
+		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Release|x64.ActiveCfg = Release|x64
111
+		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Release|x64.Build.0 = Release|x64
90 112
 		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Debug|Win32.ActiveCfg = Debug|Win32
91 113
 		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Debug|Win32.Build.0 = Debug|Win32
114
+		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Debug|x64.ActiveCfg = Debug|x64
115
+		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Debug|x64.Build.0 = Debug|x64
92 116
 		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Release|Win32.ActiveCfg = Release|Win32
93 117
 		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Release|Win32.Build.0 = Release|Win32
118
+		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Release|x64.ActiveCfg = Release|x64
119
+		{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}.Release|x64.Build.0 = Release|x64
94 120
 		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Debug|Win32.ActiveCfg = Debug|Win32
95 121
 		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Debug|Win32.Build.0 = Debug|Win32
122
+		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Debug|x64.ActiveCfg = Debug|x64
123
+		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Debug|x64.Build.0 = Debug|x64
96 124
 		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Release|Win32.ActiveCfg = Release|Win32
97 125
 		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Release|Win32.Build.0 = Release|Win32
126
+		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Release|x64.ActiveCfg = Release|x64
127
+		{81AF8E63-81A8-4748-84E7-72DA558906B6}.Release|x64.Build.0 = Release|x64
98 128
 		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Debug|Win32.ActiveCfg = Debug|Win32
99 129
 		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Debug|Win32.Build.0 = Debug|Win32
130
+		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Debug|x64.ActiveCfg = Debug|x64
131
+		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Debug|x64.Build.0 = Debug|x64
100 132
 		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Release|Win32.ActiveCfg = Release|Win32
101 133
 		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Release|Win32.Build.0 = Release|Win32
134
+		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Release|x64.ActiveCfg = Release|x64
135
+		{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}.Release|x64.Build.0 = Release|x64
102 136
 		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Debug|Win32.ActiveCfg = Debug|Win32
103 137
 		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Debug|Win32.Build.0 = Debug|Win32
138
+		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Debug|x64.ActiveCfg = Debug|x64
139
+		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Debug|x64.Build.0 = Debug|x64
104 140
 		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Release|Win32.ActiveCfg = Release|Win32
105 141
 		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Release|Win32.Build.0 = Release|Win32
142
+		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Release|x64.ActiveCfg = Release|x64
143
+		{B174EBB8-99AE-4371-9A54-79DC309730DA}.Release|x64.Build.0 = Release|x64
106 144
 		{28710655-9C06-4803-8752-55A99115773F}.Debug|Win32.ActiveCfg = Debug|Win32
107 145
 		{28710655-9C06-4803-8752-55A99115773F}.Debug|Win32.Build.0 = Debug|Win32
146
+		{28710655-9C06-4803-8752-55A99115773F}.Debug|x64.ActiveCfg = Debug|x64
147
+		{28710655-9C06-4803-8752-55A99115773F}.Debug|x64.Build.0 = Debug|x64
108 148
 		{28710655-9C06-4803-8752-55A99115773F}.Release|Win32.ActiveCfg = Release|Win32
109 149
 		{28710655-9C06-4803-8752-55A99115773F}.Release|Win32.Build.0 = Release|Win32
150
+		{28710655-9C06-4803-8752-55A99115773F}.Release|x64.ActiveCfg = Release|x64
151
+		{28710655-9C06-4803-8752-55A99115773F}.Release|x64.Build.0 = Release|x64
110 152
 		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Debug|Win32.ActiveCfg = Debug|Win32
111 153
 		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Debug|Win32.Build.0 = Debug|Win32
154
+		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Debug|x64.ActiveCfg = Debug|x64
155
+		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Debug|x64.Build.0 = Debug|x64
112 156
 		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Release|Win32.ActiveCfg = Release|Win32
113 157
 		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Release|Win32.Build.0 = Release|Win32
158
+		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Release|x64.ActiveCfg = Release|x64
159
+		{6D7B62E9-883D-406C-B6F8-1636D3962772}.Release|x64.Build.0 = Release|x64
114 160
 		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Debug|Win32.ActiveCfg = Debug|Win32
115 161
 		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Debug|Win32.Build.0 = Debug|Win32
162
+		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Debug|x64.ActiveCfg = Debug|x64
163
+		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Debug|x64.Build.0 = Debug|x64
116 164
 		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Release|Win32.ActiveCfg = Release|Win32
117 165
 		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Release|Win32.Build.0 = Release|Win32
166
+		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Release|x64.ActiveCfg = Release|x64
167
+		{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Release|x64.Build.0 = Release|x64
118 168
 		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|Win32.ActiveCfg = Debug|Win32
119 169
 		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|Win32.Build.0 = Debug|Win32
170
+		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|x64.ActiveCfg = Debug|x64
171
+		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|x64.Build.0 = Debug|x64
120 172
 		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.ActiveCfg = Release|Win32
121 173
 		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.Build.0 = Release|Win32
174
+		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|x64.ActiveCfg = Release|x64
175
+		{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|x64.Build.0 = Release|x64
122 176
 		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|Win32.ActiveCfg = Debug|Win32
123 177
 		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|Win32.Build.0 = Debug|Win32
178
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|x64.ActiveCfg = Debug|x64
179
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|x64.Build.0 = Debug|x64
124 180
 		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.ActiveCfg = Release|Win32
125 181
 		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.Build.0 = Release|Win32
182
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|x64.ActiveCfg = Release|x64
183
+		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|x64.Build.0 = Release|x64
126 184
 		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Debug|Win32.ActiveCfg = Debug|Win32
127 185
 		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Debug|Win32.Build.0 = Debug|Win32
186
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Debug|x64.ActiveCfg = Debug|x64
187
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Debug|x64.Build.0 = Debug|x64
128 188
 		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Release|Win32.ActiveCfg = Release|Win32
129 189
 		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Release|Win32.Build.0 = Release|Win32
190
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Release|x64.ActiveCfg = Release|x64
191
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Release|x64.Build.0 = Release|x64
130 192
 	EndGlobalSection
131 193
 	GlobalSection(SolutionProperties) = preSolution
132 194
 		HideSolutionNode = FALSE
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="LLVMcodegen"
5 6
 	ProjectGUID="{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="LLVMcodegen"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="1"
21
-			ConfigurationType="4"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="4"
27
+			CharacterSet="1"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,149 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				Name="VCCLCompilerTool"
43
+				Optimization="0"
42 44
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
45
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				ExceptionHandling="1"
43 48
 				BasicRuntimeChecks="3"
49
+				RuntimeLibrary="3"
50
+				UsePrecompiledHeader="0"
51
+				WarningLevel="3"
44 52
 				DebugInformationFormat="3"
45 53
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
54
+			/>
55
+			<Tool
56
+				Name="VCManagedResourceCompilerTool"
57
+			/>
58
+			<Tool
59
+				Name="VCResourceCompilerTool"
60
+			/>
61
+			<Tool
62
+				Name="VCPreLinkEventTool"
63
+			/>
64
+			<Tool
65
+				Name="VCLibrarianTool"
66
+			/>
67
+			<Tool
68
+				Name="VCALinkTool"
69
+			/>
70
+			<Tool
71
+				Name="VCXDCMakeTool"
72
+			/>
73
+			<Tool
74
+				Name="VCBscMakeTool"
75
+			/>
76
+			<Tool
77
+				Name="VCFxCopTool"
78
+			/>
79
+			<Tool
80
+				Name="VCPostBuildEventTool"
81
+			/>
82
+		</Configuration>
83
+		<Configuration
84
+			Name="Release|Win32"
85
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
86
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
87
+			ConfigurationType="4"
88
+			CharacterSet="1"
89
+			WholeProgramOptimization="1"
90
+			>
91
+			<Tool
92
+				Name="VCPreBuildEventTool"
93
+			/>
94
+			<Tool
95
+				Name="VCCustomBuildTool"
96
+			/>
97
+			<Tool
98
+				Name="VCXMLDataGeneratorTool"
99
+			/>
100
+			<Tool
101
+				Name="VCWebServiceProxyGeneratorTool"
102
+			/>
103
+			<Tool
104
+				Name="VCMIDLTool"
105
+			/>
106
+			<Tool
107
+				Name="VCCLCompilerTool"
108
+				Optimization="2"
109
+				EnableIntrinsicFunctions="true"
110
+				WholeProgramOptimization="false"
111
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
112
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46 113
 				ExceptionHandling="1"
47
-				MinimalRebuild="true"
114
+				RuntimeLibrary="2"
115
+				EnableFunctionLevelLinking="false"
116
+				UsePrecompiledHeader="0"
117
+				WarningLevel="3"
118
+				DebugInformationFormat="3"
119
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
120
+			/>
121
+			<Tool
122
+				Name="VCManagedResourceCompilerTool"
123
+			/>
124
+			<Tool
125
+				Name="VCResourceCompilerTool"
126
+			/>
127
+			<Tool
128
+				Name="VCPreLinkEventTool"
129
+			/>
130
+			<Tool
131
+				Name="VCLibrarianTool"
132
+			/>
133
+			<Tool
134
+				Name="VCALinkTool"
135
+			/>
136
+			<Tool
137
+				Name="VCXDCMakeTool"
138
+			/>
139
+			<Tool
140
+				Name="VCBscMakeTool"
141
+			/>
142
+			<Tool
143
+				Name="VCFxCopTool"
144
+			/>
145
+			<Tool
146
+				Name="VCPostBuildEventTool"
147
+			/>
148
+		</Configuration>
149
+		<Configuration
150
+			Name="Debug|x64"
151
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
152
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
153
+			ConfigurationType="4"
154
+			CharacterSet="1"
155
+			>
156
+			<Tool
157
+				Name="VCPreBuildEventTool"
158
+			/>
159
+			<Tool
160
+				Name="VCCustomBuildTool"
161
+			/>
162
+			<Tool
163
+				Name="VCXMLDataGeneratorTool"
164
+			/>
165
+			<Tool
166
+				Name="VCWebServiceProxyGeneratorTool"
167
+			/>
168
+			<Tool
169
+				Name="VCMIDLTool"
170
+				TargetEnvironment="3"
171
+			/>
172
+			<Tool
48 173
 				Name="VCCLCompilerTool"
49 174
 				Optimization="0"
175
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
50 176
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
177
+				MinimalRebuild="true"
178
+				ExceptionHandling="1"
179
+				BasicRuntimeChecks="3"
51 180
 				RuntimeLibrary="3"
52 181
 				UsePrecompiledHeader="0"
53 182
 				WarningLevel="3"
183
+				DebugInformationFormat="3"
184
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
54 185
 			/>
55 186
 			<Tool
56 187
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -81,11 +215,11 @@
81 81
 			/>
82 82
 		</Configuration>
83 83
 		<Configuration
84
-			CharacterSet="1"
84
+			Name="Release|x64"
85
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
86
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
85 87
 			ConfigurationType="4"
86
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
87
-			Name="Release|Win32"
88
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
88
+			CharacterSet="1"
89 89
 			WholeProgramOptimization="1"
90 90
 			>
91 91
 			<Tool
... ...
@@ -102,21 +236,22 @@
102 102
 			/>
103 103
 			<Tool
104 104
 				Name="VCMIDLTool"
105
+				TargetEnvironment="3"
105 106
 			/>
106 107
 			<Tool
107
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
108
-				DebugInformationFormat="3"
109
-				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
110
-				EnableFunctionLevelLinking="false"
111
-				EnableIntrinsicFunctions="true"
112
-				ExceptionHandling="1"
113 108
 				Name="VCCLCompilerTool"
114 109
 				Optimization="2"
110
+				EnableIntrinsicFunctions="true"
111
+				WholeProgramOptimization="false"
112
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
115 113
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
114
+				ExceptionHandling="1"
116 115
 				RuntimeLibrary="2"
116
+				EnableFunctionLevelLinking="false"
117 117
 				UsePrecompiledHeader="0"
118 118
 				WarningLevel="3"
119
-				WholeProgramOptimization="false"
119
+				DebugInformationFormat="3"
120
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
120 121
 			/>
121 122
 			<Tool
122 123
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -151,39 +286,11 @@
151 151
 	</References>
152 152
 	<Files>
153 153
 		<Filter
154
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
155 154
 			Name="Source Files"
155
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
156 156
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
157 157
 			>
158 158
 			<File
159
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfoImpls.cpp"
160
-				>
161
-			</File>
162
-			<File
163
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\TargetLoweringObjectFileImpl.cpp"
164
-				>
165
-			</File>
166
-			<File
167
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp"
168
-				>
169
-			</File>
170
-			<File
171
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineCSE.cpp"
172
-				>
173
-			</File>
174
-			<File
175
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\OptimizePHIs.cpp"
176
-				>
177
-			</File>
178
-			<File
179
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCNullStreamer.cpp"
180
-				>
181
-			</File>
182
-			<File
183
-				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\DeadMachineInstructionElim.cpp"
184
-				>
185
-			</File>
186
-			<File
187 159
 				RelativePath="..\libclamav\c++\llvm\lib\Transforms\Utils\AddrModeMatcher.cpp"
188 160
 				>
189 161
 			</File>
... ...
@@ -240,6 +347,10 @@
240 240
 				>
241 241
 			</File>
242 242
 			<File
243
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\DeadMachineInstructionElim.cpp"
244
+				>
245
+			</File>
246
+			<File
243 247
 				RelativePath="..\libclamav\c++\llvm\lib\Transforms\Utils\DemoteRegToStack.cpp"
244 248
 				>
245 249
 			</File>
... ...
@@ -400,6 +511,10 @@
400 400
 				>
401 401
 			</File>
402 402
 			<File
403
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineCSE.cpp"
404
+				>
405
+			</File>
406
+			<File
403 407
 				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineDominators.cpp"
404 408
 				>
405 409
 			</File>
... ...
@@ -412,6 +527,10 @@
412 412
 				>
413 413
 			</File>
414 414
 			<File
415
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfoImpls.cpp"
416
+				>
417
+			</File>
418
+			<File
415 419
 				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachinePassRegistry.cpp"
416 420
 				>
417 421
 			</File>
... ...
@@ -448,6 +567,14 @@
448 448
 				>
449 449
 			</File>
450 450
 			<File
451
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCNullStreamer.cpp"
452
+				>
453
+			</File>
454
+			<File
455
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp"
456
+				>
457
+			</File>
458
+			<File
451 459
 				RelativePath="..\libclamav\c++\llvm\lib\MC\MCStreamer.cpp"
452 460
 				>
453 461
 			</File>
... ...
@@ -464,6 +591,10 @@
464 464
 				>
465 465
 			</File>
466 466
 			<File
467
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\OptimizePHIs.cpp"
468
+				>
469
+			</File>
470
+			<File
467 471
 				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\Passes.cpp"
468 472
 				>
469 473
 			</File>
... ...
@@ -620,6 +751,10 @@
620 620
 				>
621 621
 			</File>
622 622
 			<File
623
+				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\TargetLoweringObjectFileImpl.cpp"
624
+				>
625
+			</File>
626
+			<File
623 627
 				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetSubtarget.cpp"
624 628
 				>
625 629
 			</File>
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="LLVMjit"
5 6
 	ProjectGUID="{6D7B62E9-883D-406C-B6F8-1636D3962772}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="LLVMjit"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="1"
21
-			ConfigurationType="4"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="4"
27
+			CharacterSet="1"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,149 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				Name="VCCLCompilerTool"
43
+				Optimization="0"
42 44
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
45
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				ExceptionHandling="1"
43 48
 				BasicRuntimeChecks="3"
49
+				RuntimeLibrary="3"
50
+				UsePrecompiledHeader="0"
51
+				WarningLevel="3"
44 52
 				DebugInformationFormat="3"
45 53
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
54
+			/>
55
+			<Tool
56
+				Name="VCManagedResourceCompilerTool"
57
+			/>
58
+			<Tool
59
+				Name="VCResourceCompilerTool"
60
+			/>
61
+			<Tool
62
+				Name="VCPreLinkEventTool"
63
+			/>
64
+			<Tool
65
+				Name="VCLibrarianTool"
66
+			/>
67
+			<Tool
68
+				Name="VCALinkTool"
69
+			/>
70
+			<Tool
71
+				Name="VCXDCMakeTool"
72
+			/>
73
+			<Tool
74
+				Name="VCBscMakeTool"
75
+			/>
76
+			<Tool
77
+				Name="VCFxCopTool"
78
+			/>
79
+			<Tool
80
+				Name="VCPostBuildEventTool"
81
+			/>
82
+		</Configuration>
83
+		<Configuration
84
+			Name="Release|Win32"
85
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
86
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
87
+			ConfigurationType="4"
88
+			CharacterSet="1"
89
+			WholeProgramOptimization="1"
90
+			>
91
+			<Tool
92
+				Name="VCPreBuildEventTool"
93
+			/>
94
+			<Tool
95
+				Name="VCCustomBuildTool"
96
+			/>
97
+			<Tool
98
+				Name="VCXMLDataGeneratorTool"
99
+			/>
100
+			<Tool
101
+				Name="VCWebServiceProxyGeneratorTool"
102
+			/>
103
+			<Tool
104
+				Name="VCMIDLTool"
105
+			/>
106
+			<Tool
107
+				Name="VCCLCompilerTool"
108
+				Optimization="2"
109
+				EnableIntrinsicFunctions="true"
110
+				WholeProgramOptimization="false"
111
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
112
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46 113
 				ExceptionHandling="1"
47
-				MinimalRebuild="true"
114
+				RuntimeLibrary="2"
115
+				EnableFunctionLevelLinking="false"
116
+				UsePrecompiledHeader="0"
117
+				WarningLevel="3"
118
+				DebugInformationFormat="3"
119
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
120
+			/>
121
+			<Tool
122
+				Name="VCManagedResourceCompilerTool"
123
+			/>
124
+			<Tool
125
+				Name="VCResourceCompilerTool"
126
+			/>
127
+			<Tool
128
+				Name="VCPreLinkEventTool"
129
+			/>
130
+			<Tool
131
+				Name="VCLibrarianTool"
132
+			/>
133
+			<Tool
134
+				Name="VCALinkTool"
135
+			/>
136
+			<Tool
137
+				Name="VCXDCMakeTool"
138
+			/>
139
+			<Tool
140
+				Name="VCBscMakeTool"
141
+			/>
142
+			<Tool
143
+				Name="VCFxCopTool"
144
+			/>
145
+			<Tool
146
+				Name="VCPostBuildEventTool"
147
+			/>
148
+		</Configuration>
149
+		<Configuration
150
+			Name="Debug|x64"
151
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
152
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
153
+			ConfigurationType="4"
154
+			CharacterSet="1"
155
+			>
156
+			<Tool
157
+				Name="VCPreBuildEventTool"
158
+			/>
159
+			<Tool
160
+				Name="VCCustomBuildTool"
161
+			/>
162
+			<Tool
163
+				Name="VCXMLDataGeneratorTool"
164
+			/>
165
+			<Tool
166
+				Name="VCWebServiceProxyGeneratorTool"
167
+			/>
168
+			<Tool
169
+				Name="VCMIDLTool"
170
+				TargetEnvironment="3"
171
+			/>
172
+			<Tool
48 173
 				Name="VCCLCompilerTool"
49 174
 				Optimization="0"
175
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
50 176
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
177
+				MinimalRebuild="true"
178
+				ExceptionHandling="1"
179
+				BasicRuntimeChecks="3"
51 180
 				RuntimeLibrary="3"
52 181
 				UsePrecompiledHeader="0"
53 182
 				WarningLevel="3"
183
+				DebugInformationFormat="3"
184
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
54 185
 			/>
55 186
 			<Tool
56 187
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -81,11 +215,11 @@
81 81
 			/>
82 82
 		</Configuration>
83 83
 		<Configuration
84
-			CharacterSet="1"
84
+			Name="Release|x64"
85
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
86
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
85 87
 			ConfigurationType="4"
86
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
87
-			Name="Release|Win32"
88
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
88
+			CharacterSet="1"
89 89
 			WholeProgramOptimization="1"
90 90
 			>
91 91
 			<Tool
... ...
@@ -102,21 +236,22 @@
102 102
 			/>
103 103
 			<Tool
104 104
 				Name="VCMIDLTool"
105
+				TargetEnvironment="3"
105 106
 			/>
106 107
 			<Tool
107
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
108
-				DebugInformationFormat="3"
109
-				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
110
-				EnableFunctionLevelLinking="false"
111
-				EnableIntrinsicFunctions="true"
112
-				ExceptionHandling="1"
113 108
 				Name="VCCLCompilerTool"
114 109
 				Optimization="2"
110
+				EnableIntrinsicFunctions="true"
111
+				WholeProgramOptimization="false"
112
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
115 113
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
114
+				ExceptionHandling="1"
116 115
 				RuntimeLibrary="2"
116
+				EnableFunctionLevelLinking="false"
117 117
 				UsePrecompiledHeader="0"
118 118
 				WarningLevel="3"
119
-				WholeProgramOptimization="false"
119
+				DebugInformationFormat="3"
120
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
120 121
 			/>
121 122
 			<Tool
122 123
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -151,31 +286,11 @@
151 151
 	</References>
152 152
 	<Files>
153 153
 		<Filter
154
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
155 154
 			Name="Source Files"
155
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
156 156
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
157 157
 			>
158 158
 			<File
159
-				RelativePath="..\libclamav\c++\llvm\lib\Analysis\IPA\CallGraph.cpp"
160
-				>
161
-			</File>
162
-			<File
163
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\LLVMContextImpl.cpp"
164
-				>
165
-			</File>
166
-			<File
167
-				RelativePath="..\libclamav\c++\llvm\lib\Transforms\Scalar\DCE.cpp"
168
-				>
169
-			</File>
170
-			<File
171
-				RelativePath="..\libclamav\c++\llvm\lib\VMCore\GVMaterializer.cpp"
172
-				>
173
-			</File>
174
-			<File
175
-				RelativePath="..\libclamav\c++\llvm\lib\Analysis\PointerTracking.cpp"
176
-				>
177
-			</File>
178
-			<File
179 159
 				RelativePath="..\libclamav\c++\llvm\lib\Analysis\AliasAnalysis.cpp"
180 160
 				>
181 161
 			</File>
... ...
@@ -212,6 +327,10 @@
212 212
 				>
213 213
 			</File>
214 214
 			<File
215
+				RelativePath="..\libclamav\c++\llvm\lib\Analysis\IPA\CallGraph.cpp"
216
+				>
217
+			</File>
218
+			<File
215 219
 				RelativePath="..\libclamav\c++\llvm\lib\Analysis\CaptureTracking.cpp"
216 220
 				>
217 221
 			</File>
... ...
@@ -240,6 +359,10 @@
240 240
 				>
241 241
 			</File>
242 242
 			<File
243
+				RelativePath="..\libclamav\c++\llvm\lib\Transforms\Scalar\DCE.cpp"
244
+				>
245
+			</File>
246
+			<File
243 247
 				RelativePath="..\libclamav\c++\llvm\lib\Support\Debug.cpp"
244 248
 				>
245 249
 			</File>
... ...
@@ -292,6 +415,10 @@
292 292
 				>
293 293
 			</File>
294 294
 			<File
295
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\GVMaterializer.cpp"
296
+				>
297
+			</File>
298
+			<File
295 299
 				RelativePath="..\libclamav\c++\llvm\lib\VMCore\InlineAsm.cpp"
296 300
 				>
297 301
 			</File>
... ...
@@ -344,6 +471,10 @@
344 344
 				>
345 345
 			</File>
346 346
 			<File
347
+				RelativePath="..\libclamav\c++\llvm\lib\VMCore\LLVMContextImpl.cpp"
348
+				>
349
+			</File>
350
+			<File
347 351
 				RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineBasicBlock.cpp"
348 352
 				>
349 353
 			</File>
... ...
@@ -436,6 +567,10 @@
436 436
 				>
437 437
 			</File>
438 438
 			<File
439
+				RelativePath="..\libclamav\c++\llvm\lib\Analysis\PointerTracking.cpp"
440
+				>
441
+			</File>
442
+			<File
439 443
 				RelativePath="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp"
440 444
 				>
441 445
 			</File>
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="LLVMsystem"
5 6
 	ProjectGUID="{B174EBB8-99AE-4371-9A54-79DC309730DA}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="LLVMsystem"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="4"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="4"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,149 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				Name="VCCLCompilerTool"
43
+				Optimization="0"
42 44
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;"
45
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				ExceptionHandling="1"
43 48
 				BasicRuntimeChecks="3"
49
+				RuntimeLibrary="3"
50
+				UsePrecompiledHeader="0"
51
+				WarningLevel="3"
44 52
 				DebugInformationFormat="3"
45 53
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
54
+			/>
55
+			<Tool
56
+				Name="VCManagedResourceCompilerTool"
57
+			/>
58
+			<Tool
59
+				Name="VCResourceCompilerTool"
60
+			/>
61
+			<Tool
62
+				Name="VCPreLinkEventTool"
63
+			/>
64
+			<Tool
65
+				Name="VCLibrarianTool"
66
+			/>
67
+			<Tool
68
+				Name="VCALinkTool"
69
+			/>
70
+			<Tool
71
+				Name="VCXDCMakeTool"
72
+			/>
73
+			<Tool
74
+				Name="VCBscMakeTool"
75
+			/>
76
+			<Tool
77
+				Name="VCFxCopTool"
78
+			/>
79
+			<Tool
80
+				Name="VCPostBuildEventTool"
81
+			/>
82
+		</Configuration>
83
+		<Configuration
84
+			Name="Release|Win32"
85
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
86
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
87
+			ConfigurationType="4"
88
+			CharacterSet="2"
89
+			WholeProgramOptimization="1"
90
+			>
91
+			<Tool
92
+				Name="VCPreBuildEventTool"
93
+			/>
94
+			<Tool
95
+				Name="VCCustomBuildTool"
96
+			/>
97
+			<Tool
98
+				Name="VCXMLDataGeneratorTool"
99
+			/>
100
+			<Tool
101
+				Name="VCWebServiceProxyGeneratorTool"
102
+			/>
103
+			<Tool
104
+				Name="VCMIDLTool"
105
+			/>
106
+			<Tool
107
+				Name="VCCLCompilerTool"
108
+				Optimization="2"
109
+				EnableIntrinsicFunctions="true"
110
+				WholeProgramOptimization="false"
111
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;"
112
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46 113
 				ExceptionHandling="1"
47
-				MinimalRebuild="true"
114
+				RuntimeLibrary="2"
115
+				EnableFunctionLevelLinking="false"
116
+				UsePrecompiledHeader="0"
117
+				WarningLevel="3"
118
+				DebugInformationFormat="3"
119
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
120
+			/>
121
+			<Tool
122
+				Name="VCManagedResourceCompilerTool"
123
+			/>
124
+			<Tool
125
+				Name="VCResourceCompilerTool"
126
+			/>
127
+			<Tool
128
+				Name="VCPreLinkEventTool"
129
+			/>
130
+			<Tool
131
+				Name="VCLibrarianTool"
132
+			/>
133
+			<Tool
134
+				Name="VCALinkTool"
135
+			/>
136
+			<Tool
137
+				Name="VCXDCMakeTool"
138
+			/>
139
+			<Tool
140
+				Name="VCBscMakeTool"
141
+			/>
142
+			<Tool
143
+				Name="VCFxCopTool"
144
+			/>
145
+			<Tool
146
+				Name="VCPostBuildEventTool"
147
+			/>
148
+		</Configuration>
149
+		<Configuration
150
+			Name="Debug|x64"
151
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
152
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
153
+			ConfigurationType="4"
154
+			CharacterSet="2"
155
+			>
156
+			<Tool
157
+				Name="VCPreBuildEventTool"
158
+			/>
159
+			<Tool
160
+				Name="VCCustomBuildTool"
161
+			/>
162
+			<Tool
163
+				Name="VCXMLDataGeneratorTool"
164
+			/>
165
+			<Tool
166
+				Name="VCWebServiceProxyGeneratorTool"
167
+			/>
168
+			<Tool
169
+				Name="VCMIDLTool"
170
+				TargetEnvironment="3"
171
+			/>
172
+			<Tool
48 173
 				Name="VCCLCompilerTool"
49 174
 				Optimization="0"
175
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;"
50 176
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
177
+				MinimalRebuild="true"
178
+				ExceptionHandling="1"
179
+				BasicRuntimeChecks="3"
51 180
 				RuntimeLibrary="3"
52 181
 				UsePrecompiledHeader="0"
53 182
 				WarningLevel="3"
183
+				DebugInformationFormat="3"
184
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
54 185
 			/>
55 186
 			<Tool
56 187
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -81,11 +215,11 @@
81 81
 			/>
82 82
 		</Configuration>
83 83
 		<Configuration
84
-			CharacterSet="2"
84
+			Name="Release|x64"
85
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
86
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
85 87
 			ConfigurationType="4"
86
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
87
-			Name="Release|Win32"
88
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
88
+			CharacterSet="2"
89 89
 			WholeProgramOptimization="1"
90 90
 			>
91 91
 			<Tool
... ...
@@ -102,21 +236,22 @@
102 102
 			/>
103 103
 			<Tool
104 104
 				Name="VCMIDLTool"
105
+				TargetEnvironment="3"
105 106
 			/>
106 107
 			<Tool
107
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;"
108
-				DebugInformationFormat="3"
109
-				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
110
-				EnableFunctionLevelLinking="false"
111
-				EnableIntrinsicFunctions="true"
112
-				ExceptionHandling="1"
113 108
 				Name="VCCLCompilerTool"
114 109
 				Optimization="2"
110
+				EnableIntrinsicFunctions="true"
111
+				WholeProgramOptimization="false"
112
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;"
115 113
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
114
+				ExceptionHandling="1"
116 115
 				RuntimeLibrary="2"
116
+				EnableFunctionLevelLinking="false"
117 117
 				UsePrecompiledHeader="0"
118 118
 				WarningLevel="3"
119
-				WholeProgramOptimization="false"
119
+				DebugInformationFormat="3"
120
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
120 121
 			/>
121 122
 			<Tool
122 123
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -151,8 +286,8 @@
151 151
 	</References>
152 152
 	<Files>
153 153
 		<Filter
154
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
155 154
 			Name="Source Files"
155
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
156 156
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
157 157
 			>
158 158
 			<File
... ...
@@ -1,27 +1,33 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="LLVMx86codegen"
5 6
 	ProjectGUID="{28710655-9C06-4803-8752-55A99115773F}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="LLVMx86codegen"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
20
+		<DefaultToolFile
21
+			FileName="masm.rules"
22
+		/>
17 23
 	</ToolFiles>
18 24
 	<Configurations>
19 25
 		<Configuration
20
-			CharacterSet="1"
21
-			ConfigurationType="4"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 26
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
27
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
28
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
29
+			ConfigurationType="4"
30
+			CharacterSet="1"
25 31
 			>
26 32
 			<Tool
27 33
 				Name="VCPreBuildEventTool"
... ...
@@ -30,6 +36,9 @@
30 30
 				Name="VCCustomBuildTool"
31 31
 			/>
32 32
 			<Tool
33
+				Name="MASM64"
34
+			/>
35
+			<Tool
33 36
 				Name="VCXMLDataGeneratorTool"
34 37
 			/>
35 38
 			<Tool
... ...
@@ -39,17 +48,84 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				Name="VCCLCompilerTool"
43
+				Optimization="0"
42 44
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86&quot;;&quot;$(SolutionDir)..\libclamav\c++\&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
45
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
43 47
 				BasicRuntimeChecks="3"
48
+				RuntimeLibrary="3"
49
+				UsePrecompiledHeader="0"
50
+				WarningLevel="3"
44 51
 				DebugInformationFormat="3"
45 52
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
46
-				MinimalRebuild="true"
53
+			/>
54
+			<Tool
55
+				Name="VCManagedResourceCompilerTool"
56
+			/>
57
+			<Tool
58
+				Name="VCResourceCompilerTool"
59
+			/>
60
+			<Tool
61
+				Name="VCPreLinkEventTool"
62
+			/>
63
+			<Tool
64
+				Name="VCLibrarianTool"
65
+			/>
66
+			<Tool
67
+				Name="VCALinkTool"
68
+			/>
69
+			<Tool
70
+				Name="VCXDCMakeTool"
71
+			/>
72
+			<Tool
73
+				Name="VCBscMakeTool"
74
+			/>
75
+			<Tool
76
+				Name="VCFxCopTool"
77
+			/>
78
+			<Tool
79
+				Name="VCPostBuildEventTool"
80
+			/>
81
+		</Configuration>
82
+		<Configuration
83
+			Name="Debug|x64"
84
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
85
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
86
+			ConfigurationType="4"
87
+			CharacterSet="1"
88
+			>
89
+			<Tool
90
+				Name="VCPreBuildEventTool"
91
+			/>
92
+			<Tool
93
+				Name="VCCustomBuildTool"
94
+			/>
95
+			<Tool
96
+				Name="MASM64"
97
+			/>
98
+			<Tool
99
+				Name="VCXMLDataGeneratorTool"
100
+			/>
101
+			<Tool
102
+				Name="VCWebServiceProxyGeneratorTool"
103
+			/>
104
+			<Tool
105
+				Name="VCMIDLTool"
106
+				TargetEnvironment="3"
107
+			/>
108
+			<Tool
47 109
 				Name="VCCLCompilerTool"
48 110
 				Optimization="0"
111
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86&quot;;&quot;$(SolutionDir)..\libclamav\c++\&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
49 112
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
113
+				MinimalRebuild="true"
114
+				BasicRuntimeChecks="3"
50 115
 				RuntimeLibrary="3"
51 116
 				UsePrecompiledHeader="0"
52 117
 				WarningLevel="3"
118
+				DebugInformationFormat="3"
119
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
53 120
 			/>
54 121
 			<Tool
55 122
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -80,11 +156,11 @@
80 80
 			/>
81 81
 		</Configuration>
82 82
 		<Configuration
83
-			CharacterSet="1"
84
-			ConfigurationType="4"
85
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
86 83
 			Name="Release|Win32"
87
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
84
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
85
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
86
+			ConfigurationType="4"
87
+			CharacterSet="1"
88 88
 			WholeProgramOptimization="1"
89 89
 			>
90 90
 			<Tool
... ...
@@ -94,6 +170,9 @@
94 94
 				Name="VCCustomBuildTool"
95 95
 			/>
96 96
 			<Tool
97
+				Name="MASM64"
98
+			/>
99
+			<Tool
97 100
 				Name="VCXMLDataGeneratorTool"
98 101
 			/>
99 102
 			<Tool
... ...
@@ -103,18 +182,87 @@
103 103
 				Name="VCMIDLTool"
104 104
 			/>
105 105
 			<Tool
106
+				Name="VCCLCompilerTool"
107
+				Optimization="2"
108
+				EnableIntrinsicFunctions="true"
109
+				WholeProgramOptimization="false"
106 110
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86&quot;;&quot;$(SolutionDir)..\libclamav\c++\&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
111
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
112
+				RuntimeLibrary="2"
113
+				EnableFunctionLevelLinking="false"
114
+				UsePrecompiledHeader="0"
115
+				WarningLevel="3"
107 116
 				DebugInformationFormat="3"
108 117
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
109
-				EnableFunctionLevelLinking="false"
110
-				EnableIntrinsicFunctions="true"
118
+			/>
119
+			<Tool
120
+				Name="VCManagedResourceCompilerTool"
121
+			/>
122
+			<Tool
123
+				Name="VCResourceCompilerTool"
124
+			/>
125
+			<Tool
126
+				Name="VCPreLinkEventTool"
127
+			/>
128
+			<Tool
129
+				Name="VCLibrarianTool"
130
+			/>
131
+			<Tool
132
+				Name="VCALinkTool"
133
+			/>
134
+			<Tool
135
+				Name="VCXDCMakeTool"
136
+			/>
137
+			<Tool
138
+				Name="VCBscMakeTool"
139
+			/>
140
+			<Tool
141
+				Name="VCFxCopTool"
142
+			/>
143
+			<Tool
144
+				Name="VCPostBuildEventTool"
145
+			/>
146
+		</Configuration>
147
+		<Configuration
148
+			Name="Release|x64"
149
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
150
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
151
+			ConfigurationType="4"
152
+			CharacterSet="1"
153
+			WholeProgramOptimization="1"
154
+			>
155
+			<Tool
156
+				Name="VCPreBuildEventTool"
157
+			/>
158
+			<Tool
159
+				Name="VCCustomBuildTool"
160
+			/>
161
+			<Tool
162
+				Name="MASM64"
163
+			/>
164
+			<Tool
165
+				Name="VCXMLDataGeneratorTool"
166
+			/>
167
+			<Tool
168
+				Name="VCWebServiceProxyGeneratorTool"
169
+			/>
170
+			<Tool
171
+				Name="VCMIDLTool"
172
+				TargetEnvironment="3"
173
+			/>
174
+			<Tool
111 175
 				Name="VCCLCompilerTool"
112 176
 				Optimization="2"
177
+				EnableIntrinsicFunctions="true"
178
+				WholeProgramOptimization="false"
179
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86&quot;;&quot;$(SolutionDir)..\libclamav\c++\&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;"
113 180
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
114 181
 				RuntimeLibrary="2"
182
+				EnableFunctionLevelLinking="false"
115 183
 				UsePrecompiledHeader="0"
116 184
 				WarningLevel="3"
117
-				WholeProgramOptimization="false"
185
+				DebugInformationFormat="3"
186
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
118 187
 			/>
119 188
 			<Tool
120 189
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -149,45 +297,57 @@
149 149
 	</References>
150 150
 	<Files>
151 151
 		<Filter
152
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
153 152
 			Name="Source Files"
153
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
154 154
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
155 155
 			>
156 156
 			<File
157
-				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86AsmBackend.cpp"
158
-				>
159
-			</File>
160
-			<File
161
-				RelativePath="..\libclamav\c++\llvm\lib\MC\TargetAsmBackend.cpp"
157
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfoCOFF.cpp"
162 158
 				>
163 159
 			</File>
164 160
 			<File
165
-				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86MCCodeEmitter.cpp"
161
+				RelativePath="..\libclamav\c++\llvm\lib\MC\MCCodeEmitter.cpp"
166 162
 				>
167 163
 			</File>
168 164
 			<File
169
-				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86MCTargetExpr.cpp"
165
+				RelativePath="..\libclamav\c++\llvm\lib\MC\TargetAsmBackend.cpp"
170 166
 				>
171 167
 			</File>
172 168
 			<File
173
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfoCOFF.cpp"
169
+				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetELFWriterInfo.cpp"
174 170
 				>
175 171
 			</File>
176 172
 			<File
177
-				RelativePath="..\libclamav\c++\llvm\lib\MC\MCCodeEmitter.cpp"
173
+				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86AsmBackend.cpp"
178 174
 				>
179 175
 			</File>
180 176
 			<File
181
-				RelativePath="..\libclamav\c++\llvm\lib\Target\TargetELFWriterInfo.cpp"
177
+				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86CodeEmitter.cpp"
182 178
 				>
183 179
 			</File>
184 180
 			<File
185
-				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86CodeEmitter.cpp"
181
+				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86COFFMachineModuleInfo.cpp"
186 182
 				>
187 183
 			</File>
188 184
 			<File
189
-				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86COFFMachineModuleInfo.cpp"
185
+				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86CompilationCallback_Win64.asm"
190 186
 				>
187
+				<FileConfiguration
188
+					Name="Debug|Win32"
189
+					ExcludedFromBuild="true"
190
+					>
191
+					<Tool
192
+						Name="MASM64"
193
+					/>
194
+				</FileConfiguration>
195
+				<FileConfiguration
196
+					Name="Release|Win32"
197
+					ExcludedFromBuild="true"
198
+					>
199
+					<Tool
200
+						Name="MASM64"
201
+					/>
202
+				</FileConfiguration>
191 203
 			</File>
192 204
 			<File
193 205
 				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86ELFWriterInfo.cpp"
... ...
@@ -226,6 +386,14 @@
226 226
 				>
227 227
 			</File>
228 228
 			<File
229
+				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86MCCodeEmitter.cpp"
230
+				>
231
+			</File>
232
+			<File
233
+				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86MCTargetExpr.cpp"
234
+				>
235
+			</File>
236
+			<File
229 237
 				RelativePath="..\libclamav\c++\llvm\lib\Target\X86\X86RegisterInfo.cpp"
230 238
 				>
231 239
 			</File>
... ...
@@ -5,7 +5,9 @@ ClamAV for Win32
5 5
 
6 6
 To build the source code you will need:
7 7
 - Git for windows with a git "shell"
8
-- Microsoft Visual Studio 2008 (the express version is just fine)
8
+- Microsoft Visual Studio 2008: the express version builds the 32bit target
9
+just fine but it requires a decent amount of fiddling in order to compile
10
+the 64bit target; this configuration is therefore not supported.
9 11
 
10 12
 To run the binaries at least Windows 2000 is required. Microsoft Visual C++ 2008
11 13
 runtime libraries needs to be installed on the system. See:
... ...
@@ -30,8 +32,8 @@ Skip this step if you are building from an official release tarball.
30 30
 3- Compilation
31 31
 
32 32
 Open win32/ClamAV.sln in Visual Studio and build all.
33
-The output directory for the binaries is either /win32/Debug or /win32/Release,
34
-depending on the configuration you pick.
33
+The output directory for the binaries is either /win32/(Win32|x64)/Debug or
34
+/win32/(Win32|x64)/Release depending on the configuration you pick.
35 35
 
36 36
 
37 37
 4- Special notes
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="clambc"
5 6
 	ProjectGUID="{81AF8E63-81A8-4748-84E7-72DA558906B6}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="clambc"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="1"
21
-			ConfigurationType="1"
22
-			IntermediateDirectory="$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="1"
27
+			CharacterSet="1"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,93 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				Name="VCCLCompilerTool"
43
+				Optimization="0"
42 44
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
45
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
43 47
 				BasicRuntimeChecks="3"
44
-				CompileAs="1"
48
+				RuntimeLibrary="3"
49
+				UsePrecompiledHeader="0"
50
+				WarningLevel="3"
45 51
 				DebugInformationFormat="3"
52
+				CompileAs="1"
46 53
 				DisableSpecificWarnings="4996;4244"
47
-				MinimalRebuild="true"
54
+			/>
55
+			<Tool
56
+				Name="VCManagedResourceCompilerTool"
57
+			/>
58
+			<Tool
59
+				Name="VCResourceCompilerTool"
60
+			/>
61
+			<Tool
62
+				Name="VCPreLinkEventTool"
63
+			/>
64
+			<Tool
65
+				Name="VCLinkerTool"
66
+				LinkIncremental="2"
67
+				GenerateDebugInformation="true"
68
+				SubSystem="1"
69
+				RandomizedBaseAddress="1"
70
+				TargetMachine="1"
71
+			/>
72
+			<Tool
73
+				Name="VCALinkTool"
74
+			/>
75
+			<Tool
76
+				Name="VCManifestTool"
77
+			/>
78
+			<Tool
79
+				Name="VCXDCMakeTool"
80
+			/>
81
+			<Tool
82
+				Name="VCBscMakeTool"
83
+			/>
84
+			<Tool
85
+				Name="VCFxCopTool"
86
+			/>
87
+			<Tool
88
+				Name="VCAppVerifierTool"
89
+			/>
90
+			<Tool
91
+				Name="VCPostBuildEventTool"
92
+			/>
93
+		</Configuration>
94
+		<Configuration
95
+			Name="Release|Win32"
96
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
97
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
98
+			ConfigurationType="1"
99
+			CharacterSet="1"
100
+			WholeProgramOptimization="1"
101
+			>
102
+			<Tool
103
+				Name="VCPreBuildEventTool"
104
+			/>
105
+			<Tool
106
+				Name="VCCustomBuildTool"
107
+			/>
108
+			<Tool
109
+				Name="VCXMLDataGeneratorTool"
110
+			/>
111
+			<Tool
112
+				Name="VCWebServiceProxyGeneratorTool"
113
+			/>
114
+			<Tool
115
+				Name="VCMIDLTool"
116
+			/>
117
+			<Tool
48 118
 				Name="VCCLCompilerTool"
49
-				Optimization="0"
119
+				Optimization="2"
120
+				EnableIntrinsicFunctions="true"
121
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 122
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
51
-				RuntimeLibrary="3"
123
+				RuntimeLibrary="2"
124
+				EnableFunctionLevelLinking="true"
52 125
 				UsePrecompiledHeader="0"
53 126
 				WarningLevel="3"
127
+				DebugInformationFormat="3"
128
+				DisableSpecificWarnings="4996;4244"
54 129
 			/>
55 130
 			<Tool
56 131
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,11 +140,12 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
66
-				LinkIncremental="2"
67 65
 				Name="VCLinkerTool"
68
-				RandomizedBaseAddress="1"
66
+				LinkIncremental="1"
67
+				GenerateDebugInformation="true"
69 68
 				SubSystem="1"
69
+				OptimizeReferences="2"
70
+				EnableCOMDATFolding="2"
70 71
 				TargetMachine="1"
71 72
 			/>
72 73
 			<Tool
... ...
@@ -92,12 +171,11 @@
92 92
 			/>
93 93
 		</Configuration>
94 94
 		<Configuration
95
-			CharacterSet="1"
95
+			Name="Debug|x64"
96
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
97
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
96 98
 			ConfigurationType="1"
97
-			IntermediateDirectory="$(ConfigurationName)"
98
-			Name="Release|Win32"
99
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
100
-			WholeProgramOptimization="1"
99
+			CharacterSet="1"
101 100
 			>
102 101
 			<Tool
103 102
 				Name="VCPreBuildEventTool"
... ...
@@ -113,19 +191,97 @@
113 113
 			/>
114 114
 			<Tool
115 115
 				Name="VCMIDLTool"
116
+				TargetEnvironment="3"
116 117
 			/>
117 118
 			<Tool
119
+				Name="VCCLCompilerTool"
120
+				Optimization="0"
118 121
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
122
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
123
+				MinimalRebuild="true"
124
+				BasicRuntimeChecks="3"
125
+				RuntimeLibrary="3"
126
+				UsePrecompiledHeader="0"
127
+				WarningLevel="3"
119 128
 				DebugInformationFormat="3"
129
+				CompileAs="1"
120 130
 				DisableSpecificWarnings="4996;4244"
121
-				EnableFunctionLevelLinking="true"
122
-				EnableIntrinsicFunctions="true"
131
+			/>
132
+			<Tool
133
+				Name="VCManagedResourceCompilerTool"
134
+			/>
135
+			<Tool
136
+				Name="VCResourceCompilerTool"
137
+			/>
138
+			<Tool
139
+				Name="VCPreLinkEventTool"
140
+			/>
141
+			<Tool
142
+				Name="VCLinkerTool"
143
+				LinkIncremental="2"
144
+				GenerateDebugInformation="true"
145
+				SubSystem="1"
146
+				RandomizedBaseAddress="1"
147
+				TargetMachine="17"
148
+			/>
149
+			<Tool
150
+				Name="VCALinkTool"
151
+			/>
152
+			<Tool
153
+				Name="VCManifestTool"
154
+			/>
155
+			<Tool
156
+				Name="VCXDCMakeTool"
157
+			/>
158
+			<Tool
159
+				Name="VCBscMakeTool"
160
+			/>
161
+			<Tool
162
+				Name="VCFxCopTool"
163
+			/>
164
+			<Tool
165
+				Name="VCAppVerifierTool"
166
+			/>
167
+			<Tool
168
+				Name="VCPostBuildEventTool"
169
+			/>
170
+		</Configuration>
171
+		<Configuration
172
+			Name="Release|x64"
173
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
174
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
175
+			ConfigurationType="1"
176
+			CharacterSet="1"
177
+			WholeProgramOptimization="1"
178
+			>
179
+			<Tool
180
+				Name="VCPreBuildEventTool"
181
+			/>
182
+			<Tool
183
+				Name="VCCustomBuildTool"
184
+			/>
185
+			<Tool
186
+				Name="VCXMLDataGeneratorTool"
187
+			/>
188
+			<Tool
189
+				Name="VCWebServiceProxyGeneratorTool"
190
+			/>
191
+			<Tool
192
+				Name="VCMIDLTool"
193
+				TargetEnvironment="3"
194
+			/>
195
+			<Tool
123 196
 				Name="VCCLCompilerTool"
124 197
 				Optimization="2"
198
+				EnableIntrinsicFunctions="true"
199
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
125 200
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
126 201
 				RuntimeLibrary="2"
202
+				EnableFunctionLevelLinking="true"
127 203
 				UsePrecompiledHeader="0"
128 204
 				WarningLevel="3"
205
+				DebugInformationFormat="3"
206
+				DisableSpecificWarnings="4996;4244"
129 207
 			/>
130 208
 			<Tool
131 209
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -137,13 +293,13 @@
137 137
 				Name="VCPreLinkEventTool"
138 138
 			/>
139 139
 			<Tool
140
-				EnableCOMDATFolding="2"
141
-				GenerateDebugInformation="true"
142
-				LinkIncremental="1"
143 140
 				Name="VCLinkerTool"
144
-				OptimizeReferences="2"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
145 143
 				SubSystem="1"
146
-				TargetMachine="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="17"
147 147
 			/>
148 148
 			<Tool
149 149
 				Name="VCALinkTool"
... ...
@@ -176,8 +332,8 @@
176 176
 	</References>
177 177
 	<Files>
178 178
 		<Filter
179
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
180 179
 			Name="Source Files"
180
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
181 181
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
182 182
 			>
183 183
 			<File
... ...
@@ -190,14 +346,14 @@
190 190
 			</File>
191 191
 		</Filter>
192 192
 		<Filter
193
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
194 193
 			Name="Header Files"
194
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
195 195
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
196 196
 			>
197 197
 		</Filter>
198 198
 		<Filter
199
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
200 199
 			Name="Resource Files"
200
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
201 201
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
202 202
 			>
203 203
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="clamconf"
5 6
 	ProjectGUID="{DEABE3C7-6F4D-4221-8EEE-AD19C8261273}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="clamconf"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="1"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="1"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996;4244"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996;4244"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,9 +65,9 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
66
-				LinkIncremental="1"
67 65
 				Name="VCLinkerTool"
66
+				LinkIncremental="1"
67
+				GenerateDebugInformation="true"
68 68
 				SubSystem="1"
69 69
 				TargetMachine="1"
70 70
 			/>
... ...
@@ -91,11 +94,11 @@
91 91
 			/>
92 92
 		</Configuration>
93 93
 		<Configuration
94
-			CharacterSet="2"
95
-			ConfigurationType="1"
96
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
97 94
 			Name="Release|Win32"
98
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
95
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
96
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
97
+			ConfigurationType="1"
98
+			CharacterSet="2"
99 99
 			WholeProgramOptimization="1"
100 100
 			>
101 101
 			<Tool
... ...
@@ -114,18 +117,171 @@
114 114
 				Name="VCMIDLTool"
115 115
 			/>
116 116
 			<Tool
117
+				Name="VCCLCompilerTool"
118
+				Optimization="2"
119
+				EnableIntrinsicFunctions="true"
117 120
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
121
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
122
+				RuntimeLibrary="2"
123
+				EnableFunctionLevelLinking="true"
124
+				UsePrecompiledHeader="0"
125
+				WarningLevel="3"
126
+				DebugInformationFormat="3"
118 127
 				CompileAs="1"
128
+				DisableSpecificWarnings="4996;4244"
129
+			/>
130
+			<Tool
131
+				Name="VCManagedResourceCompilerTool"
132
+			/>
133
+			<Tool
134
+				Name="VCResourceCompilerTool"
135
+			/>
136
+			<Tool
137
+				Name="VCPreLinkEventTool"
138
+			/>
139
+			<Tool
140
+				Name="VCLinkerTool"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
143
+				SubSystem="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="1"
147
+			/>
148
+			<Tool
149
+				Name="VCALinkTool"
150
+			/>
151
+			<Tool
152
+				Name="VCManifestTool"
153
+			/>
154
+			<Tool
155
+				Name="VCXDCMakeTool"
156
+			/>
157
+			<Tool
158
+				Name="VCBscMakeTool"
159
+			/>
160
+			<Tool
161
+				Name="VCFxCopTool"
162
+			/>
163
+			<Tool
164
+				Name="VCAppVerifierTool"
165
+			/>
166
+			<Tool
167
+				Name="VCPostBuildEventTool"
168
+			/>
169
+		</Configuration>
170
+		<Configuration
171
+			Name="Debug|x64"
172
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
173
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
174
+			ConfigurationType="1"
175
+			CharacterSet="2"
176
+			>
177
+			<Tool
178
+				Name="VCPreBuildEventTool"
179
+			/>
180
+			<Tool
181
+				Name="VCCustomBuildTool"
182
+			/>
183
+			<Tool
184
+				Name="VCXMLDataGeneratorTool"
185
+			/>
186
+			<Tool
187
+				Name="VCWebServiceProxyGeneratorTool"
188
+			/>
189
+			<Tool
190
+				Name="VCMIDLTool"
191
+				TargetEnvironment="3"
192
+			/>
193
+			<Tool
194
+				Name="VCCLCompilerTool"
195
+				Optimization="0"
196
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
197
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
198
+				MinimalRebuild="true"
199
+				BasicRuntimeChecks="3"
200
+				RuntimeLibrary="3"
201
+				UsePrecompiledHeader="0"
202
+				WarningLevel="3"
119 203
 				DebugInformationFormat="3"
204
+				CompileAs="1"
120 205
 				DisableSpecificWarnings="4996;4244"
121
-				EnableFunctionLevelLinking="true"
122
-				EnableIntrinsicFunctions="true"
206
+			/>
207
+			<Tool
208
+				Name="VCManagedResourceCompilerTool"
209
+			/>
210
+			<Tool
211
+				Name="VCResourceCompilerTool"
212
+			/>
213
+			<Tool
214
+				Name="VCPreLinkEventTool"
215
+			/>
216
+			<Tool
217
+				Name="VCLinkerTool"
218
+				LinkIncremental="1"
219
+				GenerateDebugInformation="true"
220
+				SubSystem="1"
221
+				TargetMachine="17"
222
+			/>
223
+			<Tool
224
+				Name="VCALinkTool"
225
+			/>
226
+			<Tool
227
+				Name="VCManifestTool"
228
+			/>
229
+			<Tool
230
+				Name="VCXDCMakeTool"
231
+			/>
232
+			<Tool
233
+				Name="VCBscMakeTool"
234
+			/>
235
+			<Tool
236
+				Name="VCFxCopTool"
237
+			/>
238
+			<Tool
239
+				Name="VCAppVerifierTool"
240
+			/>
241
+			<Tool
242
+				Name="VCPostBuildEventTool"
243
+			/>
244
+		</Configuration>
245
+		<Configuration
246
+			Name="Release|x64"
247
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
248
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
249
+			ConfigurationType="1"
250
+			CharacterSet="2"
251
+			WholeProgramOptimization="1"
252
+			>
253
+			<Tool
254
+				Name="VCPreBuildEventTool"
255
+			/>
256
+			<Tool
257
+				Name="VCCustomBuildTool"
258
+			/>
259
+			<Tool
260
+				Name="VCXMLDataGeneratorTool"
261
+			/>
262
+			<Tool
263
+				Name="VCWebServiceProxyGeneratorTool"
264
+			/>
265
+			<Tool
266
+				Name="VCMIDLTool"
267
+				TargetEnvironment="3"
268
+			/>
269
+			<Tool
123 270
 				Name="VCCLCompilerTool"
124 271
 				Optimization="2"
272
+				EnableIntrinsicFunctions="true"
273
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
125 274
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
126 275
 				RuntimeLibrary="2"
276
+				EnableFunctionLevelLinking="true"
127 277
 				UsePrecompiledHeader="0"
128 278
 				WarningLevel="3"
279
+				DebugInformationFormat="3"
280
+				CompileAs="1"
281
+				DisableSpecificWarnings="4996;4244"
129 282
 			/>
130 283
 			<Tool
131 284
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -137,13 +293,13 @@
137 137
 				Name="VCPreLinkEventTool"
138 138
 			/>
139 139
 			<Tool
140
-				EnableCOMDATFolding="2"
141
-				GenerateDebugInformation="true"
142
-				LinkIncremental="1"
143 140
 				Name="VCLinkerTool"
144
-				OptimizeReferences="2"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
145 143
 				SubSystem="1"
146
-				TargetMachine="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="17"
147 147
 			/>
148 148
 			<Tool
149 149
 				Name="VCALinkTool"
... ...
@@ -176,8 +332,8 @@
176 176
 	</References>
177 177
 	<Files>
178 178
 		<Filter
179
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
180 179
 			Name="Source Files"
180
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
181 181
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
182 182
 			>
183 183
 			<File
... ...
@@ -194,14 +350,14 @@
194 194
 			</Filter>
195 195
 		</Filter>
196 196
 		<Filter
197
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
198 197
 			Name="Header Files"
198
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
199 199
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
200 200
 			>
201 201
 		</Filter>
202 202
 		<Filter
203
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
204 203
 			Name="Resource Files"
204
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
205 205
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
206 206
 			>
207 207
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="clamd"
5 6
 	ProjectGUID="{B3CA73CF-E71E-42F3-95DE-43797A86C798}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="clamd"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="1"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="1"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996;4244;4090;4018"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996;4244;4090;4018"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,9 +65,9 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
66
-				LinkIncremental="1"
67 65
 				Name="VCLinkerTool"
66
+				LinkIncremental="1"
67
+				GenerateDebugInformation="true"
68 68
 				SubSystem="1"
69 69
 				TargetMachine="1"
70 70
 			/>
... ...
@@ -91,11 +94,11 @@
91 91
 			/>
92 92
 		</Configuration>
93 93
 		<Configuration
94
-			CharacterSet="2"
95
-			ConfigurationType="1"
96
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
97 94
 			Name="Release|Win32"
98
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
95
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
96
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
97
+			ConfigurationType="1"
98
+			CharacterSet="2"
99 99
 			WholeProgramOptimization="1"
100 100
 			>
101 101
 			<Tool
... ...
@@ -114,18 +117,171 @@
114 114
 				Name="VCMIDLTool"
115 115
 			/>
116 116
 			<Tool
117
+				Name="VCCLCompilerTool"
118
+				Optimization="2"
119
+				EnableIntrinsicFunctions="true"
117 120
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
121
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
122
+				RuntimeLibrary="2"
123
+				EnableFunctionLevelLinking="true"
124
+				UsePrecompiledHeader="0"
125
+				WarningLevel="3"
126
+				DebugInformationFormat="3"
118 127
 				CompileAs="1"
128
+				DisableSpecificWarnings="4996;4244;4090;4018"
129
+			/>
130
+			<Tool
131
+				Name="VCManagedResourceCompilerTool"
132
+			/>
133
+			<Tool
134
+				Name="VCResourceCompilerTool"
135
+			/>
136
+			<Tool
137
+				Name="VCPreLinkEventTool"
138
+			/>
139
+			<Tool
140
+				Name="VCLinkerTool"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
143
+				SubSystem="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="1"
147
+			/>
148
+			<Tool
149
+				Name="VCALinkTool"
150
+			/>
151
+			<Tool
152
+				Name="VCManifestTool"
153
+			/>
154
+			<Tool
155
+				Name="VCXDCMakeTool"
156
+			/>
157
+			<Tool
158
+				Name="VCBscMakeTool"
159
+			/>
160
+			<Tool
161
+				Name="VCFxCopTool"
162
+			/>
163
+			<Tool
164
+				Name="VCAppVerifierTool"
165
+			/>
166
+			<Tool
167
+				Name="VCPostBuildEventTool"
168
+			/>
169
+		</Configuration>
170
+		<Configuration
171
+			Name="Debug|x64"
172
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
173
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
174
+			ConfigurationType="1"
175
+			CharacterSet="2"
176
+			>
177
+			<Tool
178
+				Name="VCPreBuildEventTool"
179
+			/>
180
+			<Tool
181
+				Name="VCCustomBuildTool"
182
+			/>
183
+			<Tool
184
+				Name="VCXMLDataGeneratorTool"
185
+			/>
186
+			<Tool
187
+				Name="VCWebServiceProxyGeneratorTool"
188
+			/>
189
+			<Tool
190
+				Name="VCMIDLTool"
191
+				TargetEnvironment="3"
192
+			/>
193
+			<Tool
194
+				Name="VCCLCompilerTool"
195
+				Optimization="0"
196
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
197
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
198
+				MinimalRebuild="true"
199
+				BasicRuntimeChecks="3"
200
+				RuntimeLibrary="3"
201
+				UsePrecompiledHeader="0"
202
+				WarningLevel="3"
119 203
 				DebugInformationFormat="3"
204
+				CompileAs="1"
120 205
 				DisableSpecificWarnings="4996;4244;4090;4018"
121
-				EnableFunctionLevelLinking="true"
122
-				EnableIntrinsicFunctions="true"
206
+			/>
207
+			<Tool
208
+				Name="VCManagedResourceCompilerTool"
209
+			/>
210
+			<Tool
211
+				Name="VCResourceCompilerTool"
212
+			/>
213
+			<Tool
214
+				Name="VCPreLinkEventTool"
215
+			/>
216
+			<Tool
217
+				Name="VCLinkerTool"
218
+				LinkIncremental="1"
219
+				GenerateDebugInformation="true"
220
+				SubSystem="1"
221
+				TargetMachine="17"
222
+			/>
223
+			<Tool
224
+				Name="VCALinkTool"
225
+			/>
226
+			<Tool
227
+				Name="VCManifestTool"
228
+			/>
229
+			<Tool
230
+				Name="VCXDCMakeTool"
231
+			/>
232
+			<Tool
233
+				Name="VCBscMakeTool"
234
+			/>
235
+			<Tool
236
+				Name="VCFxCopTool"
237
+			/>
238
+			<Tool
239
+				Name="VCAppVerifierTool"
240
+			/>
241
+			<Tool
242
+				Name="VCPostBuildEventTool"
243
+			/>
244
+		</Configuration>
245
+		<Configuration
246
+			Name="Release|x64"
247
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
248
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
249
+			ConfigurationType="1"
250
+			CharacterSet="2"
251
+			WholeProgramOptimization="1"
252
+			>
253
+			<Tool
254
+				Name="VCPreBuildEventTool"
255
+			/>
256
+			<Tool
257
+				Name="VCCustomBuildTool"
258
+			/>
259
+			<Tool
260
+				Name="VCXMLDataGeneratorTool"
261
+			/>
262
+			<Tool
263
+				Name="VCWebServiceProxyGeneratorTool"
264
+			/>
265
+			<Tool
266
+				Name="VCMIDLTool"
267
+				TargetEnvironment="3"
268
+			/>
269
+			<Tool
123 270
 				Name="VCCLCompilerTool"
124 271
 				Optimization="2"
272
+				EnableIntrinsicFunctions="true"
273
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
125 274
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
126 275
 				RuntimeLibrary="2"
276
+				EnableFunctionLevelLinking="true"
127 277
 				UsePrecompiledHeader="0"
128 278
 				WarningLevel="3"
279
+				DebugInformationFormat="3"
280
+				CompileAs="1"
281
+				DisableSpecificWarnings="4996;4244;4090;4018"
129 282
 			/>
130 283
 			<Tool
131 284
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -137,13 +293,13 @@
137 137
 				Name="VCPreLinkEventTool"
138 138
 			/>
139 139
 			<Tool
140
-				EnableCOMDATFolding="2"
141
-				GenerateDebugInformation="true"
142
-				LinkIncremental="1"
143 140
 				Name="VCLinkerTool"
144
-				OptimizeReferences="2"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
145 143
 				SubSystem="1"
146
-				TargetMachine="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="17"
147 147
 			/>
148 148
 			<Tool
149 149
 				Name="VCALinkTool"
... ...
@@ -172,8 +328,8 @@
172 172
 	</References>
173 173
 	<Files>
174 174
 		<Filter
175
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
176 175
 			Name="Source Files"
176
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
177 177
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
178 178
 			>
179 179
 			<File
... ...
@@ -222,14 +378,14 @@
222 222
 			</Filter>
223 223
 		</Filter>
224 224
 		<Filter
225
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
226 225
 			Name="Header Files"
226
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
227 227
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
228 228
 			>
229 229
 		</Filter>
230 230
 		<Filter
231
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
232 231
 			Name="Resource Files"
232
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
233 233
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
234 234
 			>
235 235
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="clamdscan"
5 6
 	ProjectGUID="{9571E1BE-DDDA-47CB-8675-238D405FCADA}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="clamdscan"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="1"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="1"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996;4244;4090"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996;4244;4090"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,9 +65,9 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
66
-				LinkIncremental="1"
67 65
 				Name="VCLinkerTool"
66
+				LinkIncremental="1"
67
+				GenerateDebugInformation="true"
68 68
 				SubSystem="1"
69 69
 				TargetMachine="1"
70 70
 			/>
... ...
@@ -91,11 +94,11 @@
91 91
 			/>
92 92
 		</Configuration>
93 93
 		<Configuration
94
-			CharacterSet="2"
95
-			ConfigurationType="1"
96
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
97 94
 			Name="Release|Win32"
98
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
95
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
96
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
97
+			ConfigurationType="1"
98
+			CharacterSet="2"
99 99
 			WholeProgramOptimization="1"
100 100
 			>
101 101
 			<Tool
... ...
@@ -114,18 +117,171 @@
114 114
 				Name="VCMIDLTool"
115 115
 			/>
116 116
 			<Tool
117
+				Name="VCCLCompilerTool"
118
+				Optimization="2"
119
+				EnableIntrinsicFunctions="true"
117 120
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
121
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
122
+				RuntimeLibrary="2"
123
+				EnableFunctionLevelLinking="true"
124
+				UsePrecompiledHeader="0"
125
+				WarningLevel="3"
126
+				DebugInformationFormat="3"
118 127
 				CompileAs="1"
128
+				DisableSpecificWarnings="4996;4244;4090"
129
+			/>
130
+			<Tool
131
+				Name="VCManagedResourceCompilerTool"
132
+			/>
133
+			<Tool
134
+				Name="VCResourceCompilerTool"
135
+			/>
136
+			<Tool
137
+				Name="VCPreLinkEventTool"
138
+			/>
139
+			<Tool
140
+				Name="VCLinkerTool"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
143
+				SubSystem="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="1"
147
+			/>
148
+			<Tool
149
+				Name="VCALinkTool"
150
+			/>
151
+			<Tool
152
+				Name="VCManifestTool"
153
+			/>
154
+			<Tool
155
+				Name="VCXDCMakeTool"
156
+			/>
157
+			<Tool
158
+				Name="VCBscMakeTool"
159
+			/>
160
+			<Tool
161
+				Name="VCFxCopTool"
162
+			/>
163
+			<Tool
164
+				Name="VCAppVerifierTool"
165
+			/>
166
+			<Tool
167
+				Name="VCPostBuildEventTool"
168
+			/>
169
+		</Configuration>
170
+		<Configuration
171
+			Name="Debug|x64"
172
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
173
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
174
+			ConfigurationType="1"
175
+			CharacterSet="2"
176
+			>
177
+			<Tool
178
+				Name="VCPreBuildEventTool"
179
+			/>
180
+			<Tool
181
+				Name="VCCustomBuildTool"
182
+			/>
183
+			<Tool
184
+				Name="VCXMLDataGeneratorTool"
185
+			/>
186
+			<Tool
187
+				Name="VCWebServiceProxyGeneratorTool"
188
+			/>
189
+			<Tool
190
+				Name="VCMIDLTool"
191
+				TargetEnvironment="3"
192
+			/>
193
+			<Tool
194
+				Name="VCCLCompilerTool"
195
+				Optimization="0"
196
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
197
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
198
+				MinimalRebuild="true"
199
+				BasicRuntimeChecks="3"
200
+				RuntimeLibrary="3"
201
+				UsePrecompiledHeader="0"
202
+				WarningLevel="3"
119 203
 				DebugInformationFormat="3"
204
+				CompileAs="1"
120 205
 				DisableSpecificWarnings="4996;4244;4090"
121
-				EnableFunctionLevelLinking="true"
122
-				EnableIntrinsicFunctions="true"
206
+			/>
207
+			<Tool
208
+				Name="VCManagedResourceCompilerTool"
209
+			/>
210
+			<Tool
211
+				Name="VCResourceCompilerTool"
212
+			/>
213
+			<Tool
214
+				Name="VCPreLinkEventTool"
215
+			/>
216
+			<Tool
217
+				Name="VCLinkerTool"
218
+				LinkIncremental="1"
219
+				GenerateDebugInformation="true"
220
+				SubSystem="1"
221
+				TargetMachine="17"
222
+			/>
223
+			<Tool
224
+				Name="VCALinkTool"
225
+			/>
226
+			<Tool
227
+				Name="VCManifestTool"
228
+			/>
229
+			<Tool
230
+				Name="VCXDCMakeTool"
231
+			/>
232
+			<Tool
233
+				Name="VCBscMakeTool"
234
+			/>
235
+			<Tool
236
+				Name="VCFxCopTool"
237
+			/>
238
+			<Tool
239
+				Name="VCAppVerifierTool"
240
+			/>
241
+			<Tool
242
+				Name="VCPostBuildEventTool"
243
+			/>
244
+		</Configuration>
245
+		<Configuration
246
+			Name="Release|x64"
247
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
248
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
249
+			ConfigurationType="1"
250
+			CharacterSet="2"
251
+			WholeProgramOptimization="1"
252
+			>
253
+			<Tool
254
+				Name="VCPreBuildEventTool"
255
+			/>
256
+			<Tool
257
+				Name="VCCustomBuildTool"
258
+			/>
259
+			<Tool
260
+				Name="VCXMLDataGeneratorTool"
261
+			/>
262
+			<Tool
263
+				Name="VCWebServiceProxyGeneratorTool"
264
+			/>
265
+			<Tool
266
+				Name="VCMIDLTool"
267
+				TargetEnvironment="3"
268
+			/>
269
+			<Tool
123 270
 				Name="VCCLCompilerTool"
124 271
 				Optimization="2"
272
+				EnableIntrinsicFunctions="true"
273
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
125 274
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
126 275
 				RuntimeLibrary="2"
276
+				EnableFunctionLevelLinking="true"
127 277
 				UsePrecompiledHeader="0"
128 278
 				WarningLevel="3"
279
+				DebugInformationFormat="3"
280
+				CompileAs="1"
281
+				DisableSpecificWarnings="4996;4244;4090"
129 282
 			/>
130 283
 			<Tool
131 284
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -137,13 +293,13 @@
137 137
 				Name="VCPreLinkEventTool"
138 138
 			/>
139 139
 			<Tool
140
-				EnableCOMDATFolding="2"
141
-				GenerateDebugInformation="true"
142
-				LinkIncremental="1"
143 140
 				Name="VCLinkerTool"
144
-				OptimizeReferences="2"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
145 143
 				SubSystem="1"
146
-				TargetMachine="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="17"
147 147
 			/>
148 148
 			<Tool
149 149
 				Name="VCALinkTool"
... ...
@@ -172,8 +328,8 @@
172 172
 	</References>
173 173
 	<Files>
174 174
 		<Filter
175
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
176 175
 			Name="Source Files"
176
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
177 177
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
178 178
 			>
179 179
 			<File
... ...
@@ -206,14 +362,14 @@
206 206
 			</Filter>
207 207
 		</Filter>
208 208
 		<Filter
209
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
210 209
 			Name="Header Files"
210
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
211 211
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
212 212
 			>
213 213
 		</Filter>
214 214
 		<Filter
215
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
216 215
 			Name="Resource Files"
216
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
217 217
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
218 218
 			>
219 219
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="clamscan"
5 6
 	ProjectGUID="{F79E7CA7-E49D-479E-8D68-0EA9CB585575}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="clamscan"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="1"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="1"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,9 +65,9 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
66
-				LinkIncremental="1"
67 65
 				Name="VCLinkerTool"
66
+				LinkIncremental="1"
67
+				GenerateDebugInformation="true"
68 68
 				SubSystem="1"
69 69
 				TargetMachine="1"
70 70
 			/>
... ...
@@ -91,11 +94,11 @@
91 91
 			/>
92 92
 		</Configuration>
93 93
 		<Configuration
94
-			CharacterSet="2"
95
-			ConfigurationType="1"
96
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
97 94
 			Name="Release|Win32"
98
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
95
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
96
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
97
+			ConfigurationType="1"
98
+			CharacterSet="2"
99 99
 			WholeProgramOptimization="1"
100 100
 			>
101 101
 			<Tool
... ...
@@ -114,19 +117,173 @@
114 114
 				Name="VCMIDLTool"
115 115
 			/>
116 116
 			<Tool
117
+				Name="VCCLCompilerTool"
118
+				Optimization="2"
119
+				EnableIntrinsicFunctions="true"
117 120
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
121
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
122
+				RuntimeLibrary="2"
118 123
 				BufferSecurityCheck="false"
124
+				EnableFunctionLevelLinking="true"
125
+				UsePrecompiledHeader="0"
126
+				WarningLevel="3"
127
+				DebugInformationFormat="3"
119 128
 				CompileAs="1"
129
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
130
+			/>
131
+			<Tool
132
+				Name="VCManagedResourceCompilerTool"
133
+			/>
134
+			<Tool
135
+				Name="VCResourceCompilerTool"
136
+			/>
137
+			<Tool
138
+				Name="VCPreLinkEventTool"
139
+			/>
140
+			<Tool
141
+				Name="VCLinkerTool"
142
+				LinkIncremental="1"
143
+				GenerateDebugInformation="true"
144
+				SubSystem="1"
145
+				OptimizeReferences="2"
146
+				EnableCOMDATFolding="2"
147
+				TargetMachine="1"
148
+			/>
149
+			<Tool
150
+				Name="VCALinkTool"
151
+			/>
152
+			<Tool
153
+				Name="VCManifestTool"
154
+			/>
155
+			<Tool
156
+				Name="VCXDCMakeTool"
157
+			/>
158
+			<Tool
159
+				Name="VCBscMakeTool"
160
+			/>
161
+			<Tool
162
+				Name="VCFxCopTool"
163
+			/>
164
+			<Tool
165
+				Name="VCAppVerifierTool"
166
+			/>
167
+			<Tool
168
+				Name="VCPostBuildEventTool"
169
+			/>
170
+		</Configuration>
171
+		<Configuration
172
+			Name="Debug|x64"
173
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
174
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
175
+			ConfigurationType="1"
176
+			CharacterSet="2"
177
+			>
178
+			<Tool
179
+				Name="VCPreBuildEventTool"
180
+			/>
181
+			<Tool
182
+				Name="VCCustomBuildTool"
183
+			/>
184
+			<Tool
185
+				Name="VCXMLDataGeneratorTool"
186
+			/>
187
+			<Tool
188
+				Name="VCWebServiceProxyGeneratorTool"
189
+			/>
190
+			<Tool
191
+				Name="VCMIDLTool"
192
+				TargetEnvironment="3"
193
+			/>
194
+			<Tool
195
+				Name="VCCLCompilerTool"
196
+				Optimization="0"
197
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
198
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
199
+				MinimalRebuild="true"
200
+				BasicRuntimeChecks="3"
201
+				RuntimeLibrary="3"
202
+				UsePrecompiledHeader="0"
203
+				WarningLevel="3"
120 204
 				DebugInformationFormat="3"
205
+				CompileAs="1"
121 206
 				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
122
-				EnableFunctionLevelLinking="true"
123
-				EnableIntrinsicFunctions="true"
207
+			/>
208
+			<Tool
209
+				Name="VCManagedResourceCompilerTool"
210
+			/>
211
+			<Tool
212
+				Name="VCResourceCompilerTool"
213
+			/>
214
+			<Tool
215
+				Name="VCPreLinkEventTool"
216
+			/>
217
+			<Tool
218
+				Name="VCLinkerTool"
219
+				LinkIncremental="1"
220
+				GenerateDebugInformation="true"
221
+				SubSystem="1"
222
+				TargetMachine="17"
223
+			/>
224
+			<Tool
225
+				Name="VCALinkTool"
226
+			/>
227
+			<Tool
228
+				Name="VCManifestTool"
229
+			/>
230
+			<Tool
231
+				Name="VCXDCMakeTool"
232
+			/>
233
+			<Tool
234
+				Name="VCBscMakeTool"
235
+			/>
236
+			<Tool
237
+				Name="VCFxCopTool"
238
+			/>
239
+			<Tool
240
+				Name="VCAppVerifierTool"
241
+			/>
242
+			<Tool
243
+				Name="VCPostBuildEventTool"
244
+			/>
245
+		</Configuration>
246
+		<Configuration
247
+			Name="Release|x64"
248
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
249
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
250
+			ConfigurationType="1"
251
+			CharacterSet="2"
252
+			WholeProgramOptimization="1"
253
+			>
254
+			<Tool
255
+				Name="VCPreBuildEventTool"
256
+			/>
257
+			<Tool
258
+				Name="VCCustomBuildTool"
259
+			/>
260
+			<Tool
261
+				Name="VCXMLDataGeneratorTool"
262
+			/>
263
+			<Tool
264
+				Name="VCWebServiceProxyGeneratorTool"
265
+			/>
266
+			<Tool
267
+				Name="VCMIDLTool"
268
+				TargetEnvironment="3"
269
+			/>
270
+			<Tool
124 271
 				Name="VCCLCompilerTool"
125 272
 				Optimization="2"
273
+				EnableIntrinsicFunctions="true"
274
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
126 275
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
127 276
 				RuntimeLibrary="2"
277
+				BufferSecurityCheck="false"
278
+				EnableFunctionLevelLinking="true"
128 279
 				UsePrecompiledHeader="0"
129 280
 				WarningLevel="3"
281
+				DebugInformationFormat="3"
282
+				CompileAs="1"
283
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
130 284
 			/>
131 285
 			<Tool
132 286
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -138,13 +295,13 @@
138 138
 				Name="VCPreLinkEventTool"
139 139
 			/>
140 140
 			<Tool
141
-				EnableCOMDATFolding="2"
142
-				GenerateDebugInformation="true"
143
-				LinkIncremental="1"
144 141
 				Name="VCLinkerTool"
145
-				OptimizeReferences="2"
142
+				LinkIncremental="1"
143
+				GenerateDebugInformation="true"
146 144
 				SubSystem="1"
147
-				TargetMachine="1"
145
+				OptimizeReferences="2"
146
+				EnableCOMDATFolding="2"
147
+				TargetMachine="17"
148 148
 			/>
149 149
 			<Tool
150 150
 				Name="VCALinkTool"
... ...
@@ -173,8 +330,8 @@
173 173
 	</References>
174 174
 	<Files>
175 175
 		<Filter
176
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
177 176
 			Name="Source Files"
177
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
178 178
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
179 179
 			>
180 180
 			<File
... ...
@@ -207,14 +364,14 @@
207 207
 			</Filter>
208 208
 		</Filter>
209 209
 		<Filter
210
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
211 210
 			Name="Header Files"
211
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
212 212
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
213 213
 			>
214 214
 		</Filter>
215 215
 		<Filter
216
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
217 216
 			Name="Resource Files"
217
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
218 218
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
219 219
 			>
220 220
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="freshclam"
5 6
 	ProjectGUID="{CEA52DD8-0418-42AD-B640-F33CC7C600CE}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="freshclam"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="1"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="1"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146;4102"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146;4102"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,10 +65,10 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
+				Name="VCLinkerTool"
65 66
 				AdditionalDependencies="dnsapi.lib"
66
-				GenerateDebugInformation="true"
67 67
 				LinkIncremental="1"
68
-				Name="VCLinkerTool"
68
+				GenerateDebugInformation="true"
69 69
 				SubSystem="1"
70 70
 				TargetMachine="1"
71 71
 			/>
... ...
@@ -92,11 +95,11 @@
92 92
 			/>
93 93
 		</Configuration>
94 94
 		<Configuration
95
-			CharacterSet="2"
96
-			ConfigurationType="1"
97
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
98 95
 			Name="Release|Win32"
99
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
96
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
97
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
98
+			ConfigurationType="1"
99
+			CharacterSet="2"
100 100
 			WholeProgramOptimization="1"
101 101
 			>
102 102
 			<Tool
... ...
@@ -115,19 +118,175 @@
115 115
 				Name="VCMIDLTool"
116 116
 			/>
117 117
 			<Tool
118
+				Name="VCCLCompilerTool"
119
+				Optimization="2"
120
+				EnableIntrinsicFunctions="true"
118 121
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
122
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
123
+				RuntimeLibrary="2"
119 124
 				BufferSecurityCheck="false"
125
+				EnableFunctionLevelLinking="true"
126
+				UsePrecompiledHeader="0"
127
+				WarningLevel="3"
128
+				DebugInformationFormat="3"
120 129
 				CompileAs="1"
130
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146;4102"
131
+			/>
132
+			<Tool
133
+				Name="VCManagedResourceCompilerTool"
134
+			/>
135
+			<Tool
136
+				Name="VCResourceCompilerTool"
137
+			/>
138
+			<Tool
139
+				Name="VCPreLinkEventTool"
140
+			/>
141
+			<Tool
142
+				Name="VCLinkerTool"
143
+				AdditionalDependencies="dnsapi.lib"
144
+				LinkIncremental="1"
145
+				GenerateDebugInformation="true"
146
+				SubSystem="1"
147
+				OptimizeReferences="2"
148
+				EnableCOMDATFolding="2"
149
+				TargetMachine="1"
150
+			/>
151
+			<Tool
152
+				Name="VCALinkTool"
153
+			/>
154
+			<Tool
155
+				Name="VCManifestTool"
156
+			/>
157
+			<Tool
158
+				Name="VCXDCMakeTool"
159
+			/>
160
+			<Tool
161
+				Name="VCBscMakeTool"
162
+			/>
163
+			<Tool
164
+				Name="VCFxCopTool"
165
+			/>
166
+			<Tool
167
+				Name="VCAppVerifierTool"
168
+			/>
169
+			<Tool
170
+				Name="VCPostBuildEventTool"
171
+			/>
172
+		</Configuration>
173
+		<Configuration
174
+			Name="Debug|x64"
175
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
176
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
177
+			ConfigurationType="1"
178
+			CharacterSet="2"
179
+			>
180
+			<Tool
181
+				Name="VCPreBuildEventTool"
182
+			/>
183
+			<Tool
184
+				Name="VCCustomBuildTool"
185
+			/>
186
+			<Tool
187
+				Name="VCXMLDataGeneratorTool"
188
+			/>
189
+			<Tool
190
+				Name="VCWebServiceProxyGeneratorTool"
191
+			/>
192
+			<Tool
193
+				Name="VCMIDLTool"
194
+				TargetEnvironment="3"
195
+			/>
196
+			<Tool
197
+				Name="VCCLCompilerTool"
198
+				Optimization="0"
199
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
200
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
201
+				MinimalRebuild="true"
202
+				BasicRuntimeChecks="3"
203
+				RuntimeLibrary="3"
204
+				UsePrecompiledHeader="0"
205
+				WarningLevel="3"
121 206
 				DebugInformationFormat="3"
207
+				CompileAs="1"
122 208
 				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146;4102"
123
-				EnableFunctionLevelLinking="true"
124
-				EnableIntrinsicFunctions="true"
209
+			/>
210
+			<Tool
211
+				Name="VCManagedResourceCompilerTool"
212
+			/>
213
+			<Tool
214
+				Name="VCResourceCompilerTool"
215
+			/>
216
+			<Tool
217
+				Name="VCPreLinkEventTool"
218
+			/>
219
+			<Tool
220
+				Name="VCLinkerTool"
221
+				AdditionalDependencies="dnsapi.lib"
222
+				LinkIncremental="1"
223
+				GenerateDebugInformation="true"
224
+				SubSystem="1"
225
+				TargetMachine="17"
226
+			/>
227
+			<Tool
228
+				Name="VCALinkTool"
229
+			/>
230
+			<Tool
231
+				Name="VCManifestTool"
232
+			/>
233
+			<Tool
234
+				Name="VCXDCMakeTool"
235
+			/>
236
+			<Tool
237
+				Name="VCBscMakeTool"
238
+			/>
239
+			<Tool
240
+				Name="VCFxCopTool"
241
+			/>
242
+			<Tool
243
+				Name="VCAppVerifierTool"
244
+			/>
245
+			<Tool
246
+				Name="VCPostBuildEventTool"
247
+			/>
248
+		</Configuration>
249
+		<Configuration
250
+			Name="Release|x64"
251
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
252
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
253
+			ConfigurationType="1"
254
+			CharacterSet="2"
255
+			WholeProgramOptimization="1"
256
+			>
257
+			<Tool
258
+				Name="VCPreBuildEventTool"
259
+			/>
260
+			<Tool
261
+				Name="VCCustomBuildTool"
262
+			/>
263
+			<Tool
264
+				Name="VCXMLDataGeneratorTool"
265
+			/>
266
+			<Tool
267
+				Name="VCWebServiceProxyGeneratorTool"
268
+			/>
269
+			<Tool
270
+				Name="VCMIDLTool"
271
+				TargetEnvironment="3"
272
+			/>
273
+			<Tool
125 274
 				Name="VCCLCompilerTool"
126 275
 				Optimization="2"
276
+				EnableIntrinsicFunctions="true"
277
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
127 278
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
128 279
 				RuntimeLibrary="2"
280
+				BufferSecurityCheck="false"
281
+				EnableFunctionLevelLinking="true"
129 282
 				UsePrecompiledHeader="0"
130 283
 				WarningLevel="3"
284
+				DebugInformationFormat="3"
285
+				CompileAs="1"
286
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146;4102"
131 287
 			/>
132 288
 			<Tool
133 289
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -139,14 +298,14 @@
139 139
 				Name="VCPreLinkEventTool"
140 140
 			/>
141 141
 			<Tool
142
+				Name="VCLinkerTool"
142 143
 				AdditionalDependencies="dnsapi.lib"
143
-				EnableCOMDATFolding="2"
144
-				GenerateDebugInformation="true"
145 144
 				LinkIncremental="1"
146
-				Name="VCLinkerTool"
147
-				OptimizeReferences="2"
145
+				GenerateDebugInformation="true"
148 146
 				SubSystem="1"
149
-				TargetMachine="1"
147
+				OptimizeReferences="2"
148
+				EnableCOMDATFolding="2"
149
+				TargetMachine="17"
150 150
 			/>
151 151
 			<Tool
152 152
 				Name="VCALinkTool"
... ...
@@ -175,8 +334,8 @@
175 175
 	</References>
176 176
 	<Files>
177 177
 		<Filter
178
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
179 178
 			Name="Source Files"
179
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
180 180
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
181 181
 			>
182 182
 			<File
... ...
@@ -241,14 +400,14 @@
241 241
 			</Filter>
242 242
 		</Filter>
243 243
 		<Filter
244
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
245 244
 			Name="Header Files"
245
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
246 246
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
247 247
 			>
248 248
 		</Filter>
249 249
 		<Filter
250
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
251 250
 			Name="Resource Files"
251
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
252 252
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
253 253
 			>
254 254
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="libclamav"
5 6
 	ProjectGUID="{3AD5B16C-340A-40AC-96AD-6017B941A316}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="libclamav"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="2"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="2"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,12 +65,12 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
+				Name="VCLinkerTool"
65 66
 				AdditionalDependencies="ws2_32.lib"
66
-				GenerateDebugInformation="true"
67
-				IgnoreAllDefaultLibraries="false"
68 67
 				LinkIncremental="1"
68
+				IgnoreAllDefaultLibraries="false"
69 69
 				ModuleDefinitionFile="$(SolutionDir)libclamav.def"
70
-				Name="VCLinkerTool"
70
+				GenerateDebugInformation="true"
71 71
 				SubSystem="2"
72 72
 				TargetMachine="1"
73 73
 			/>
... ...
@@ -94,11 +97,11 @@
94 94
 			/>
95 95
 		</Configuration>
96 96
 		<Configuration
97
-			CharacterSet="2"
98
-			ConfigurationType="2"
99
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
100 97
 			Name="Release|Win32"
101
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
98
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
99
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
100
+			ConfigurationType="2"
101
+			CharacterSet="2"
102 102
 			WholeProgramOptimization="1"
103 103
 			>
104 104
 			<Tool
... ...
@@ -117,19 +120,180 @@
117 117
 				Name="VCMIDLTool"
118 118
 			/>
119 119
 			<Tool
120
+				Name="VCCLCompilerTool"
121
+				Optimization="2"
122
+				EnableIntrinsicFunctions="true"
120 123
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
124
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
125
+				RuntimeLibrary="2"
121 126
 				BufferSecurityCheck="false"
127
+				EnableFunctionLevelLinking="true"
128
+				UsePrecompiledHeader="0"
129
+				WarningLevel="3"
130
+				DebugInformationFormat="3"
122 131
 				CompileAs="1"
132
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
133
+			/>
134
+			<Tool
135
+				Name="VCManagedResourceCompilerTool"
136
+			/>
137
+			<Tool
138
+				Name="VCResourceCompilerTool"
139
+			/>
140
+			<Tool
141
+				Name="VCPreLinkEventTool"
142
+			/>
143
+			<Tool
144
+				Name="VCLinkerTool"
145
+				UseLibraryDependencyInputs="true"
146
+				AdditionalDependencies="ws2_32.lib"
147
+				LinkIncremental="1"
148
+				IgnoreAllDefaultLibraries="false"
149
+				ModuleDefinitionFile="$(SolutionDir)libclamav.def"
150
+				GenerateDebugInformation="true"
151
+				SubSystem="2"
152
+				OptimizeReferences="2"
153
+				EnableCOMDATFolding="2"
154
+				TargetMachine="1"
155
+			/>
156
+			<Tool
157
+				Name="VCALinkTool"
158
+			/>
159
+			<Tool
160
+				Name="VCManifestTool"
161
+			/>
162
+			<Tool
163
+				Name="VCXDCMakeTool"
164
+			/>
165
+			<Tool
166
+				Name="VCBscMakeTool"
167
+			/>
168
+			<Tool
169
+				Name="VCFxCopTool"
170
+			/>
171
+			<Tool
172
+				Name="VCAppVerifierTool"
173
+			/>
174
+			<Tool
175
+				Name="VCPostBuildEventTool"
176
+			/>
177
+		</Configuration>
178
+		<Configuration
179
+			Name="Debug|x64"
180
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
181
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
182
+			ConfigurationType="2"
183
+			CharacterSet="2"
184
+			>
185
+			<Tool
186
+				Name="VCPreBuildEventTool"
187
+			/>
188
+			<Tool
189
+				Name="VCCustomBuildTool"
190
+			/>
191
+			<Tool
192
+				Name="VCXMLDataGeneratorTool"
193
+			/>
194
+			<Tool
195
+				Name="VCWebServiceProxyGeneratorTool"
196
+			/>
197
+			<Tool
198
+				Name="VCMIDLTool"
199
+				TargetEnvironment="3"
200
+			/>
201
+			<Tool
202
+				Name="VCCLCompilerTool"
203
+				Optimization="0"
204
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
205
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
206
+				MinimalRebuild="true"
207
+				BasicRuntimeChecks="3"
208
+				RuntimeLibrary="3"
209
+				UsePrecompiledHeader="0"
210
+				WarningLevel="3"
123 211
 				DebugInformationFormat="3"
212
+				CompileAs="1"
124 213
 				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
125
-				EnableFunctionLevelLinking="true"
126
-				EnableIntrinsicFunctions="true"
214
+			/>
215
+			<Tool
216
+				Name="VCManagedResourceCompilerTool"
217
+			/>
218
+			<Tool
219
+				Name="VCResourceCompilerTool"
220
+			/>
221
+			<Tool
222
+				Name="VCPreLinkEventTool"
223
+			/>
224
+			<Tool
225
+				Name="VCLinkerTool"
226
+				AdditionalDependencies="ws2_32.lib"
227
+				LinkIncremental="1"
228
+				IgnoreAllDefaultLibraries="false"
229
+				ModuleDefinitionFile="$(SolutionDir)libclamav.def"
230
+				GenerateDebugInformation="true"
231
+				SubSystem="2"
232
+				TargetMachine="17"
233
+			/>
234
+			<Tool
235
+				Name="VCALinkTool"
236
+			/>
237
+			<Tool
238
+				Name="VCManifestTool"
239
+			/>
240
+			<Tool
241
+				Name="VCXDCMakeTool"
242
+			/>
243
+			<Tool
244
+				Name="VCBscMakeTool"
245
+			/>
246
+			<Tool
247
+				Name="VCFxCopTool"
248
+			/>
249
+			<Tool
250
+				Name="VCAppVerifierTool"
251
+			/>
252
+			<Tool
253
+				Name="VCPostBuildEventTool"
254
+			/>
255
+		</Configuration>
256
+		<Configuration
257
+			Name="Release|x64"
258
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
259
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
260
+			ConfigurationType="2"
261
+			CharacterSet="2"
262
+			WholeProgramOptimization="1"
263
+			>
264
+			<Tool
265
+				Name="VCPreBuildEventTool"
266
+			/>
267
+			<Tool
268
+				Name="VCCustomBuildTool"
269
+			/>
270
+			<Tool
271
+				Name="VCXMLDataGeneratorTool"
272
+			/>
273
+			<Tool
274
+				Name="VCWebServiceProxyGeneratorTool"
275
+			/>
276
+			<Tool
277
+				Name="VCMIDLTool"
278
+				TargetEnvironment="3"
279
+			/>
280
+			<Tool
127 281
 				Name="VCCLCompilerTool"
128 282
 				Optimization="2"
283
+				EnableIntrinsicFunctions="true"
284
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
129 285
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
130 286
 				RuntimeLibrary="2"
287
+				BufferSecurityCheck="false"
288
+				EnableFunctionLevelLinking="true"
131 289
 				UsePrecompiledHeader="0"
132 290
 				WarningLevel="3"
291
+				DebugInformationFormat="3"
292
+				CompileAs="1"
293
+				DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
133 294
 			/>
134 295
 			<Tool
135 296
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -141,17 +305,17 @@
141 141
 				Name="VCPreLinkEventTool"
142 142
 			/>
143 143
 			<Tool
144
+				Name="VCLinkerTool"
145
+				UseLibraryDependencyInputs="true"
144 146
 				AdditionalDependencies="ws2_32.lib"
145
-				EnableCOMDATFolding="2"
146
-				GenerateDebugInformation="true"
147
-				IgnoreAllDefaultLibraries="false"
148 147
 				LinkIncremental="1"
148
+				IgnoreAllDefaultLibraries="false"
149 149
 				ModuleDefinitionFile="$(SolutionDir)libclamav.def"
150
-				Name="VCLinkerTool"
151
-				OptimizeReferences="2"
150
+				GenerateDebugInformation="true"
152 151
 				SubSystem="2"
153
-				TargetMachine="1"
154
-				UseLibraryDependencyInputs="true"
152
+				OptimizeReferences="2"
153
+				EnableCOMDATFolding="2"
154
+				TargetMachine="17"
155 155
 			/>
156 156
 			<Tool
157 157
 				Name="VCALinkTool"
... ...
@@ -180,8 +344,8 @@
180 180
 	</References>
181 181
 	<Files>
182 182
 		<Filter
183
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
184 183
 			Name="Source Files"
184
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
185 185
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
186 186
 			>
187 187
 			<File
... ...
@@ -550,6 +714,22 @@
550 550
 							ObjectFile="$(IntDir)\nsis_bzlib"
551 551
 						/>
552 552
 					</FileConfiguration>
553
+					<FileConfiguration
554
+						Name="Debug|x64"
555
+						>
556
+						<Tool
557
+							Name="VCCLCompilerTool"
558
+							ObjectFile="$(IntDir)\nsis_bzlib"
559
+						/>
560
+					</FileConfiguration>
561
+					<FileConfiguration
562
+						Name="Release|x64"
563
+						>
564
+						<Tool
565
+							Name="VCCLCompilerTool"
566
+							ObjectFile="$(IntDir)\nsis_bzlib"
567
+						/>
568
+					</FileConfiguration>
553 569
 				</File>
554 570
 				<File
555 571
 					RelativePath="..\libclamav\nsis\infblock.c"
... ...
@@ -570,6 +750,22 @@
570 570
 							ObjectFile="$(IntDir)\nsis_infblock"
571 571
 						/>
572 572
 					</FileConfiguration>
573
+					<FileConfiguration
574
+						Name="Debug|x64"
575
+						>
576
+						<Tool
577
+							Name="VCCLCompilerTool"
578
+							ObjectFile="$(IntDir)\nsis_infblock"
579
+						/>
580
+					</FileConfiguration>
581
+					<FileConfiguration
582
+						Name="Release|x64"
583
+						>
584
+						<Tool
585
+							Name="VCCLCompilerTool"
586
+							ObjectFile="$(IntDir)\nsis_infblock"
587
+						/>
588
+					</FileConfiguration>
573 589
 				</File>
574 590
 				<File
575 591
 					RelativePath="..\libclamav\nsis\nulsft.c"
... ...
@@ -682,6 +878,14 @@
682 682
 							ObjectFile="$(IntDir)\"
683 683
 						/>
684 684
 					</FileConfiguration>
685
+					<FileConfiguration
686
+						Name="Debug|x64"
687
+						>
688
+						<Tool
689
+							Name="VCCLCompilerTool"
690
+							ObjectFile="$(IntDir)\"
691
+						/>
692
+					</FileConfiguration>
685 693
 				</File>
686 694
 				<File
687 695
 					RelativePath=".\3rdparty\bzip2\compress.c"
... ...
@@ -702,6 +906,22 @@
702 702
 							ObjectFile="$(IntDir)\compress_bzip2"
703 703
 						/>
704 704
 					</FileConfiguration>
705
+					<FileConfiguration
706
+						Name="Debug|x64"
707
+						>
708
+						<Tool
709
+							Name="VCCLCompilerTool"
710
+							ObjectFile="$(IntDir)\compress_bzip2"
711
+						/>
712
+					</FileConfiguration>
713
+					<FileConfiguration
714
+						Name="Release|x64"
715
+						>
716
+						<Tool
717
+							Name="VCCLCompilerTool"
718
+							ObjectFile="$(IntDir)\compress_bzip2"
719
+						/>
720
+					</FileConfiguration>
705 721
 				</File>
706 722
 				<File
707 723
 					RelativePath=".\3rdparty\bzip2\crctable.c"
... ...
@@ -830,14 +1050,14 @@
830 830
 			</Filter>
831 831
 		</Filter>
832 832
 		<Filter
833
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
834 833
 			Name="Header Files"
834
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
835 835
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
836 836
 			>
837 837
 		</Filter>
838 838
 		<Filter
839
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
840 839
 			Name="Resource Files"
840
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
841 841
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
842 842
 			>
843 843
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="libclamavcxx"
5 6
 	ProjectGUID="{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="libclamavcxx"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9.00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="1"
21
-			ConfigurationType="4"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="4"
27
+			CharacterSet="1"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,17 +42,146 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
+				Name="VCCLCompilerTool"
43
+				Optimization="0"
42 44
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;"
45
+				PreprocessorDefinitions="__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
43 47
 				BasicRuntimeChecks="3"
48
+				RuntimeLibrary="3"
49
+				UsePrecompiledHeader="0"
50
+				WarningLevel="3"
44 51
 				DebugInformationFormat="3"
45 52
 				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
46
-				MinimalRebuild="true"
53
+			/>
54
+			<Tool
55
+				Name="VCManagedResourceCompilerTool"
56
+			/>
57
+			<Tool
58
+				Name="VCResourceCompilerTool"
59
+			/>
60
+			<Tool
61
+				Name="VCPreLinkEventTool"
62
+			/>
63
+			<Tool
64
+				Name="VCLibrarianTool"
65
+			/>
66
+			<Tool
67
+				Name="VCALinkTool"
68
+			/>
69
+			<Tool
70
+				Name="VCXDCMakeTool"
71
+			/>
72
+			<Tool
73
+				Name="VCBscMakeTool"
74
+			/>
75
+			<Tool
76
+				Name="VCFxCopTool"
77
+			/>
78
+			<Tool
79
+				Name="VCPostBuildEventTool"
80
+			/>
81
+		</Configuration>
82
+		<Configuration
83
+			Name="Release|Win32"
84
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
85
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
86
+			ConfigurationType="4"
87
+			CharacterSet="1"
88
+			WholeProgramOptimization="1"
89
+			>
90
+			<Tool
91
+				Name="VCPreBuildEventTool"
92
+			/>
93
+			<Tool
94
+				Name="VCCustomBuildTool"
95
+			/>
96
+			<Tool
97
+				Name="VCXMLDataGeneratorTool"
98
+			/>
99
+			<Tool
100
+				Name="VCWebServiceProxyGeneratorTool"
101
+			/>
102
+			<Tool
103
+				Name="VCMIDLTool"
104
+			/>
105
+			<Tool
106
+				Name="VCCLCompilerTool"
107
+				Optimization="2"
108
+				EnableIntrinsicFunctions="true"
109
+				WholeProgramOptimization="false"
110
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;"
111
+				PreprocessorDefinitions="NDEBUG;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
112
+				RuntimeLibrary="2"
113
+				EnableFunctionLevelLinking="false"
114
+				UsePrecompiledHeader="0"
115
+				WarningLevel="3"
116
+				DebugInformationFormat="0"
117
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
118
+			/>
119
+			<Tool
120
+				Name="VCManagedResourceCompilerTool"
121
+			/>
122
+			<Tool
123
+				Name="VCResourceCompilerTool"
124
+			/>
125
+			<Tool
126
+				Name="VCPreLinkEventTool"
127
+			/>
128
+			<Tool
129
+				Name="VCLibrarianTool"
130
+			/>
131
+			<Tool
132
+				Name="VCALinkTool"
133
+			/>
134
+			<Tool
135
+				Name="VCXDCMakeTool"
136
+			/>
137
+			<Tool
138
+				Name="VCBscMakeTool"
139
+			/>
140
+			<Tool
141
+				Name="VCFxCopTool"
142
+			/>
143
+			<Tool
144
+				Name="VCPostBuildEventTool"
145
+			/>
146
+		</Configuration>
147
+		<Configuration
148
+			Name="Debug|x64"
149
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
150
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
151
+			ConfigurationType="4"
152
+			CharacterSet="1"
153
+			>
154
+			<Tool
155
+				Name="VCPreBuildEventTool"
156
+			/>
157
+			<Tool
158
+				Name="VCCustomBuildTool"
159
+			/>
160
+			<Tool
161
+				Name="VCXMLDataGeneratorTool"
162
+			/>
163
+			<Tool
164
+				Name="VCWebServiceProxyGeneratorTool"
165
+			/>
166
+			<Tool
167
+				Name="VCMIDLTool"
168
+				TargetEnvironment="3"
169
+			/>
170
+			<Tool
47 171
 				Name="VCCLCompilerTool"
48 172
 				Optimization="0"
173
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;"
49 174
 				PreprocessorDefinitions="__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
175
+				MinimalRebuild="true"
176
+				BasicRuntimeChecks="3"
50 177
 				RuntimeLibrary="3"
51 178
 				UsePrecompiledHeader="0"
52 179
 				WarningLevel="3"
180
+				DebugInformationFormat="3"
181
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
53 182
 			/>
54 183
 			<Tool
55 184
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -80,11 +212,11 @@
80 80
 			/>
81 81
 		</Configuration>
82 82
 		<Configuration
83
-			CharacterSet="1"
83
+			Name="Release|x64"
84
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
85
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
84 86
 			ConfigurationType="4"
85
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
86
-			Name="Release|Win32"
87
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
87
+			CharacterSet="1"
88 88
 			WholeProgramOptimization="1"
89 89
 			>
90 90
 			<Tool
... ...
@@ -101,20 +233,21 @@
101 101
 			/>
102 102
 			<Tool
103 103
 				Name="VCMIDLTool"
104
+				TargetEnvironment="3"
104 105
 			/>
105 106
 			<Tool
106
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;"
107
-				DebugInformationFormat="0"
108
-				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
109
-				EnableFunctionLevelLinking="false"
110
-				EnableIntrinsicFunctions="true"
111 107
 				Name="VCCLCompilerTool"
112 108
 				Optimization="2"
109
+				EnableIntrinsicFunctions="true"
110
+				WholeProgramOptimization="false"
111
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav\c++\llvm\include&quot;;&quot;$(SolutionDir)llvmbuild\include&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;"
113 112
 				PreprocessorDefinitions="NDEBUG;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
114 113
 				RuntimeLibrary="2"
114
+				EnableFunctionLevelLinking="false"
115 115
 				UsePrecompiledHeader="0"
116 116
 				WarningLevel="3"
117
-				WholeProgramOptimization="false"
117
+				DebugInformationFormat="0"
118
+				DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
118 119
 			/>
119 120
 			<Tool
120 121
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -149,8 +282,8 @@
149 149
 	</References>
150 150
 	<Files>
151 151
 		<Filter
152
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
153 152
 			Name="Source Files"
153
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
154 154
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
155 155
 			>
156 156
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="libclamunrar"
5 6
 	ProjectGUID="{41B2E193-92E3-429C-8DAC-9B287E3D7182}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="libclamunrar"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9.00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="2"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="2"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996;4244;4018;4146"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996;4244;4018;4146"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,10 +65,10 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
65
+				Name="VCLinkerTool"
66 66
 				LinkIncremental="1"
67 67
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
68
-				Name="VCLinkerTool"
68
+				GenerateDebugInformation="true"
69 69
 				SubSystem="2"
70 70
 				TargetMachine="1"
71 71
 			/>
... ...
@@ -92,11 +95,11 @@
92 92
 			/>
93 93
 		</Configuration>
94 94
 		<Configuration
95
-			CharacterSet="2"
96
-			ConfigurationType="2"
97
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
98 95
 			Name="Release|Win32"
99
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
96
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
97
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
98
+			ConfigurationType="2"
99
+			CharacterSet="2"
100 100
 			WholeProgramOptimization="1"
101 101
 			>
102 102
 			<Tool
... ...
@@ -115,19 +118,175 @@
115 115
 				Name="VCMIDLTool"
116 116
 			/>
117 117
 			<Tool
118
+				Name="VCCLCompilerTool"
119
+				Optimization="2"
120
+				EnableIntrinsicFunctions="true"
118 121
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
122
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
123
+				RuntimeLibrary="2"
119 124
 				BufferSecurityCheck="false"
125
+				EnableFunctionLevelLinking="true"
126
+				UsePrecompiledHeader="0"
127
+				WarningLevel="3"
128
+				DebugInformationFormat="3"
120 129
 				CompileAs="1"
130
+				DisableSpecificWarnings="4996;4244;4018;4146"
131
+			/>
132
+			<Tool
133
+				Name="VCManagedResourceCompilerTool"
134
+			/>
135
+			<Tool
136
+				Name="VCResourceCompilerTool"
137
+			/>
138
+			<Tool
139
+				Name="VCPreLinkEventTool"
140
+			/>
141
+			<Tool
142
+				Name="VCLinkerTool"
143
+				LinkIncremental="1"
144
+				ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
145
+				GenerateDebugInformation="true"
146
+				SubSystem="2"
147
+				OptimizeReferences="2"
148
+				EnableCOMDATFolding="2"
149
+				TargetMachine="1"
150
+			/>
151
+			<Tool
152
+				Name="VCALinkTool"
153
+			/>
154
+			<Tool
155
+				Name="VCManifestTool"
156
+			/>
157
+			<Tool
158
+				Name="VCXDCMakeTool"
159
+			/>
160
+			<Tool
161
+				Name="VCBscMakeTool"
162
+			/>
163
+			<Tool
164
+				Name="VCFxCopTool"
165
+			/>
166
+			<Tool
167
+				Name="VCAppVerifierTool"
168
+			/>
169
+			<Tool
170
+				Name="VCPostBuildEventTool"
171
+			/>
172
+		</Configuration>
173
+		<Configuration
174
+			Name="Debug|x64"
175
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
176
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
177
+			ConfigurationType="2"
178
+			CharacterSet="2"
179
+			>
180
+			<Tool
181
+				Name="VCPreBuildEventTool"
182
+			/>
183
+			<Tool
184
+				Name="VCCustomBuildTool"
185
+			/>
186
+			<Tool
187
+				Name="VCXMLDataGeneratorTool"
188
+			/>
189
+			<Tool
190
+				Name="VCWebServiceProxyGeneratorTool"
191
+			/>
192
+			<Tool
193
+				Name="VCMIDLTool"
194
+				TargetEnvironment="3"
195
+			/>
196
+			<Tool
197
+				Name="VCCLCompilerTool"
198
+				Optimization="0"
199
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
200
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
201
+				MinimalRebuild="true"
202
+				BasicRuntimeChecks="3"
203
+				RuntimeLibrary="3"
204
+				UsePrecompiledHeader="0"
205
+				WarningLevel="3"
121 206
 				DebugInformationFormat="3"
207
+				CompileAs="1"
122 208
 				DisableSpecificWarnings="4996;4244;4018;4146"
123
-				EnableFunctionLevelLinking="true"
124
-				EnableIntrinsicFunctions="true"
209
+			/>
210
+			<Tool
211
+				Name="VCManagedResourceCompilerTool"
212
+			/>
213
+			<Tool
214
+				Name="VCResourceCompilerTool"
215
+			/>
216
+			<Tool
217
+				Name="VCPreLinkEventTool"
218
+			/>
219
+			<Tool
220
+				Name="VCLinkerTool"
221
+				LinkIncremental="1"
222
+				ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
223
+				GenerateDebugInformation="true"
224
+				SubSystem="2"
225
+				TargetMachine="17"
226
+			/>
227
+			<Tool
228
+				Name="VCALinkTool"
229
+			/>
230
+			<Tool
231
+				Name="VCManifestTool"
232
+			/>
233
+			<Tool
234
+				Name="VCXDCMakeTool"
235
+			/>
236
+			<Tool
237
+				Name="VCBscMakeTool"
238
+			/>
239
+			<Tool
240
+				Name="VCFxCopTool"
241
+			/>
242
+			<Tool
243
+				Name="VCAppVerifierTool"
244
+			/>
245
+			<Tool
246
+				Name="VCPostBuildEventTool"
247
+			/>
248
+		</Configuration>
249
+		<Configuration
250
+			Name="Release|x64"
251
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
252
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
253
+			ConfigurationType="2"
254
+			CharacterSet="2"
255
+			WholeProgramOptimization="1"
256
+			>
257
+			<Tool
258
+				Name="VCPreBuildEventTool"
259
+			/>
260
+			<Tool
261
+				Name="VCCustomBuildTool"
262
+			/>
263
+			<Tool
264
+				Name="VCXMLDataGeneratorTool"
265
+			/>
266
+			<Tool
267
+				Name="VCWebServiceProxyGeneratorTool"
268
+			/>
269
+			<Tool
270
+				Name="VCMIDLTool"
271
+				TargetEnvironment="3"
272
+			/>
273
+			<Tool
125 274
 				Name="VCCLCompilerTool"
126 275
 				Optimization="2"
276
+				EnableIntrinsicFunctions="true"
277
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
127 278
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
128 279
 				RuntimeLibrary="2"
280
+				BufferSecurityCheck="false"
281
+				EnableFunctionLevelLinking="true"
129 282
 				UsePrecompiledHeader="0"
130 283
 				WarningLevel="3"
284
+				DebugInformationFormat="3"
285
+				CompileAs="1"
286
+				DisableSpecificWarnings="4996;4244;4018;4146"
131 287
 			/>
132 288
 			<Tool
133 289
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -139,14 +298,14 @@
139 139
 				Name="VCPreLinkEventTool"
140 140
 			/>
141 141
 			<Tool
142
-				EnableCOMDATFolding="2"
143
-				GenerateDebugInformation="true"
142
+				Name="VCLinkerTool"
144 143
 				LinkIncremental="1"
145 144
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
146
-				Name="VCLinkerTool"
147
-				OptimizeReferences="2"
145
+				GenerateDebugInformation="true"
148 146
 				SubSystem="2"
149
-				TargetMachine="1"
147
+				OptimizeReferences="2"
148
+				EnableCOMDATFolding="2"
149
+				TargetMachine="17"
150 150
 			/>
151 151
 			<Tool
152 152
 				Name="VCALinkTool"
... ...
@@ -175,8 +334,8 @@
175 175
 	</References>
176 176
 	<Files>
177 177
 		<Filter
178
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
179 178
 			Name="Source Files"
179
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
180 180
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
181 181
 			>
182 182
 			<File
... ...
@@ -213,14 +372,14 @@
213 213
 			</File>
214 214
 		</Filter>
215 215
 		<Filter
216
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
217 216
 			Name="Header Files"
217
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
218 218
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
219 219
 			>
220 220
 		</Filter>
221 221
 		<Filter
222
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
223 222
 			Name="Resource Files"
223
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
224 224
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
225 225
 			>
226 226
 			<File
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="libclamunrar_iface"
5 6
 	ProjectGUID="{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="libclamunrar_iface"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9.00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="2"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="2"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,10 +65,10 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
65
+				Name="VCLinkerTool"
66 66
 				LinkIncremental="1"
67 67
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
68
-				Name="VCLinkerTool"
68
+				GenerateDebugInformation="true"
69 69
 				SubSystem="2"
70 70
 				TargetMachine="1"
71 71
 			/>
... ...
@@ -92,11 +95,11 @@
92 92
 			/>
93 93
 		</Configuration>
94 94
 		<Configuration
95
-			CharacterSet="2"
96
-			ConfigurationType="2"
97
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
98 95
 			Name="Release|Win32"
99
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
96
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
97
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
98
+			ConfigurationType="2"
99
+			CharacterSet="2"
100 100
 			WholeProgramOptimization="1"
101 101
 			>
102 102
 			<Tool
... ...
@@ -115,19 +118,175 @@
115 115
 				Name="VCMIDLTool"
116 116
 			/>
117 117
 			<Tool
118
+				Name="VCCLCompilerTool"
119
+				Optimization="2"
120
+				EnableIntrinsicFunctions="true"
118 121
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
122
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
123
+				RuntimeLibrary="2"
119 124
 				BufferSecurityCheck="false"
125
+				EnableFunctionLevelLinking="true"
126
+				UsePrecompiledHeader="0"
127
+				WarningLevel="3"
128
+				DebugInformationFormat="3"
120 129
 				CompileAs="1"
130
+				DisableSpecificWarnings="4996"
131
+			/>
132
+			<Tool
133
+				Name="VCManagedResourceCompilerTool"
134
+			/>
135
+			<Tool
136
+				Name="VCResourceCompilerTool"
137
+			/>
138
+			<Tool
139
+				Name="VCPreLinkEventTool"
140
+			/>
141
+			<Tool
142
+				Name="VCLinkerTool"
143
+				LinkIncremental="1"
144
+				ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
145
+				GenerateDebugInformation="true"
146
+				SubSystem="2"
147
+				OptimizeReferences="2"
148
+				EnableCOMDATFolding="2"
149
+				TargetMachine="1"
150
+			/>
151
+			<Tool
152
+				Name="VCALinkTool"
153
+			/>
154
+			<Tool
155
+				Name="VCManifestTool"
156
+			/>
157
+			<Tool
158
+				Name="VCXDCMakeTool"
159
+			/>
160
+			<Tool
161
+				Name="VCBscMakeTool"
162
+			/>
163
+			<Tool
164
+				Name="VCFxCopTool"
165
+			/>
166
+			<Tool
167
+				Name="VCAppVerifierTool"
168
+			/>
169
+			<Tool
170
+				Name="VCPostBuildEventTool"
171
+			/>
172
+		</Configuration>
173
+		<Configuration
174
+			Name="Debug|x64"
175
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
176
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
177
+			ConfigurationType="2"
178
+			CharacterSet="2"
179
+			>
180
+			<Tool
181
+				Name="VCPreBuildEventTool"
182
+			/>
183
+			<Tool
184
+				Name="VCCustomBuildTool"
185
+			/>
186
+			<Tool
187
+				Name="VCXMLDataGeneratorTool"
188
+			/>
189
+			<Tool
190
+				Name="VCWebServiceProxyGeneratorTool"
191
+			/>
192
+			<Tool
193
+				Name="VCMIDLTool"
194
+				TargetEnvironment="3"
195
+			/>
196
+			<Tool
197
+				Name="VCCLCompilerTool"
198
+				Optimization="0"
199
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
200
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
201
+				MinimalRebuild="true"
202
+				BasicRuntimeChecks="3"
203
+				RuntimeLibrary="3"
204
+				UsePrecompiledHeader="0"
205
+				WarningLevel="3"
121 206
 				DebugInformationFormat="3"
207
+				CompileAs="1"
122 208
 				DisableSpecificWarnings="4996"
123
-				EnableFunctionLevelLinking="true"
124
-				EnableIntrinsicFunctions="true"
209
+			/>
210
+			<Tool
211
+				Name="VCManagedResourceCompilerTool"
212
+			/>
213
+			<Tool
214
+				Name="VCResourceCompilerTool"
215
+			/>
216
+			<Tool
217
+				Name="VCPreLinkEventTool"
218
+			/>
219
+			<Tool
220
+				Name="VCLinkerTool"
221
+				LinkIncremental="1"
222
+				ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
223
+				GenerateDebugInformation="true"
224
+				SubSystem="2"
225
+				TargetMachine="17"
226
+			/>
227
+			<Tool
228
+				Name="VCALinkTool"
229
+			/>
230
+			<Tool
231
+				Name="VCManifestTool"
232
+			/>
233
+			<Tool
234
+				Name="VCXDCMakeTool"
235
+			/>
236
+			<Tool
237
+				Name="VCBscMakeTool"
238
+			/>
239
+			<Tool
240
+				Name="VCFxCopTool"
241
+			/>
242
+			<Tool
243
+				Name="VCAppVerifierTool"
244
+			/>
245
+			<Tool
246
+				Name="VCPostBuildEventTool"
247
+			/>
248
+		</Configuration>
249
+		<Configuration
250
+			Name="Release|x64"
251
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
252
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
253
+			ConfigurationType="2"
254
+			CharacterSet="2"
255
+			WholeProgramOptimization="1"
256
+			>
257
+			<Tool
258
+				Name="VCPreBuildEventTool"
259
+			/>
260
+			<Tool
261
+				Name="VCCustomBuildTool"
262
+			/>
263
+			<Tool
264
+				Name="VCXMLDataGeneratorTool"
265
+			/>
266
+			<Tool
267
+				Name="VCWebServiceProxyGeneratorTool"
268
+			/>
269
+			<Tool
270
+				Name="VCMIDLTool"
271
+				TargetEnvironment="3"
272
+			/>
273
+			<Tool
125 274
 				Name="VCCLCompilerTool"
126 275
 				Optimization="2"
276
+				EnableIntrinsicFunctions="true"
277
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;"
127 278
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
128 279
 				RuntimeLibrary="2"
280
+				BufferSecurityCheck="false"
281
+				EnableFunctionLevelLinking="true"
129 282
 				UsePrecompiledHeader="0"
130 283
 				WarningLevel="3"
284
+				DebugInformationFormat="3"
285
+				CompileAs="1"
286
+				DisableSpecificWarnings="4996"
131 287
 			/>
132 288
 			<Tool
133 289
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -139,14 +298,14 @@
139 139
 				Name="VCPreLinkEventTool"
140 140
 			/>
141 141
 			<Tool
142
-				EnableCOMDATFolding="2"
143
-				GenerateDebugInformation="true"
142
+				Name="VCLinkerTool"
144 143
 				LinkIncremental="1"
145 144
 				ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
146
-				Name="VCLinkerTool"
147
-				OptimizeReferences="2"
145
+				GenerateDebugInformation="true"
148 146
 				SubSystem="2"
149
-				TargetMachine="1"
147
+				OptimizeReferences="2"
148
+				EnableCOMDATFolding="2"
149
+				TargetMachine="17"
150 150
 			/>
151 151
 			<Tool
152 152
 				Name="VCALinkTool"
... ...
@@ -175,8 +334,8 @@
175 175
 	</References>
176 176
 	<Files>
177 177
 		<Filter
178
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
179 178
 			Name="Source Files"
179
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
180 180
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
181 181
 			>
182 182
 			<File
... ...
@@ -193,14 +352,14 @@
193 193
 			</Filter>
194 194
 		</Filter>
195 195
 		<Filter
196
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
197 196
 			Name="Header Files"
197
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
198 198
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
199 199
 			>
200 200
 		</Filter>
201 201
 		<Filter
202
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
203 202
 			Name="Resource Files"
203
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
204 204
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
205 205
 			>
206 206
 			<File
... ...
@@ -468,7 +468,11 @@
468 468
 #undef LLVM_ETCDIR
469 469
 
470 470
 /* Host triple we were built on */
471
+#ifdef _WIN64
472
+#define LLVM_HOSTTRIPLE "x86_64-pc-win32"
473
+#else
471 474
 #define LLVM_HOSTTRIPLE "i686-pc-win32"
475
+#endif
472 476
 
473 477
 /* Installation directory for include files */
474 478
 #undef LLVM_INCLUDEDIR
... ...
@@ -1,27 +1,30 @@
1 1
 <?xml version="1.0" encoding="Windows-1252"?>
2 2
 <VisualStudioProject
3
-	Keyword="Win32Proj"
3
+	ProjectType="Visual C++"
4
+	Version="9.00"
4 5
 	Name="sigtool"
5 6
 	ProjectGUID="{38B89BC0-6C00-4ABB-A179-24FEE81D1890}"
6
-	ProjectType="Visual C++"
7 7
 	RootNamespace="sigtool"
8
+	Keyword="Win32Proj"
8 9
 	TargetFrameworkVersion="196613"
9
-	Version="9,00"
10 10
 	>
11 11
 	<Platforms>
12 12
 		<Platform
13 13
 			Name="Win32"
14 14
 		/>
15
+		<Platform
16
+			Name="x64"
17
+		/>
15 18
 	</Platforms>
16 19
 	<ToolFiles>
17 20
 	</ToolFiles>
18 21
 	<Configurations>
19 22
 		<Configuration
20
-			CharacterSet="2"
21
-			ConfigurationType="1"
22
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
23 23
 			Name="Debug|Win32"
24
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
24
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
25
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
26
+			ConfigurationType="1"
27
+			CharacterSet="2"
25 28
 			>
26 29
 			<Tool
27 30
 				Name="VCPreBuildEventTool"
... ...
@@ -39,18 +42,18 @@
39 39
 				Name="VCMIDLTool"
40 40
 			/>
41 41
 			<Tool
42
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
43
-				BasicRuntimeChecks="3"
44
-				CompileAs="1"
45
-				DebugInformationFormat="3"
46
-				DisableSpecificWarnings="4996"
47
-				MinimalRebuild="true"
48 42
 				Name="VCCLCompilerTool"
49 43
 				Optimization="0"
44
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
50 45
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
46
+				MinimalRebuild="true"
47
+				BasicRuntimeChecks="3"
51 48
 				RuntimeLibrary="3"
52 49
 				UsePrecompiledHeader="0"
53 50
 				WarningLevel="3"
51
+				DebugInformationFormat="3"
52
+				CompileAs="1"
53
+				DisableSpecificWarnings="4996"
54 54
 			/>
55 55
 			<Tool
56 56
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -62,9 +65,9 @@
62 62
 				Name="VCPreLinkEventTool"
63 63
 			/>
64 64
 			<Tool
65
-				GenerateDebugInformation="true"
66
-				LinkIncremental="1"
67 65
 				Name="VCLinkerTool"
66
+				LinkIncremental="1"
67
+				GenerateDebugInformation="true"
68 68
 				SubSystem="1"
69 69
 				TargetMachine="1"
70 70
 			/>
... ...
@@ -91,11 +94,11 @@
91 91
 			/>
92 92
 		</Configuration>
93 93
 		<Configuration
94
-			CharacterSet="2"
95
-			ConfigurationType="1"
96
-			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
97 94
 			Name="Release|Win32"
98
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
95
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
96
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
97
+			ConfigurationType="1"
98
+			CharacterSet="2"
99 99
 			WholeProgramOptimization="1"
100 100
 			>
101 101
 			<Tool
... ...
@@ -114,18 +117,171 @@
114 114
 				Name="VCMIDLTool"
115 115
 			/>
116 116
 			<Tool
117
+				Name="VCCLCompilerTool"
118
+				Optimization="2"
119
+				EnableIntrinsicFunctions="true"
117 120
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
121
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
122
+				RuntimeLibrary="2"
123
+				EnableFunctionLevelLinking="true"
124
+				UsePrecompiledHeader="0"
125
+				WarningLevel="3"
126
+				DebugInformationFormat="3"
118 127
 				CompileAs="1"
128
+				DisableSpecificWarnings="4996"
129
+			/>
130
+			<Tool
131
+				Name="VCManagedResourceCompilerTool"
132
+			/>
133
+			<Tool
134
+				Name="VCResourceCompilerTool"
135
+			/>
136
+			<Tool
137
+				Name="VCPreLinkEventTool"
138
+			/>
139
+			<Tool
140
+				Name="VCLinkerTool"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
143
+				SubSystem="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="1"
147
+			/>
148
+			<Tool
149
+				Name="VCALinkTool"
150
+			/>
151
+			<Tool
152
+				Name="VCManifestTool"
153
+			/>
154
+			<Tool
155
+				Name="VCXDCMakeTool"
156
+			/>
157
+			<Tool
158
+				Name="VCBscMakeTool"
159
+			/>
160
+			<Tool
161
+				Name="VCFxCopTool"
162
+			/>
163
+			<Tool
164
+				Name="VCAppVerifierTool"
165
+			/>
166
+			<Tool
167
+				Name="VCPostBuildEventTool"
168
+			/>
169
+		</Configuration>
170
+		<Configuration
171
+			Name="Debug|x64"
172
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
173
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
174
+			ConfigurationType="1"
175
+			CharacterSet="2"
176
+			>
177
+			<Tool
178
+				Name="VCPreBuildEventTool"
179
+			/>
180
+			<Tool
181
+				Name="VCCustomBuildTool"
182
+			/>
183
+			<Tool
184
+				Name="VCXMLDataGeneratorTool"
185
+			/>
186
+			<Tool
187
+				Name="VCWebServiceProxyGeneratorTool"
188
+			/>
189
+			<Tool
190
+				Name="VCMIDLTool"
191
+				TargetEnvironment="3"
192
+			/>
193
+			<Tool
194
+				Name="VCCLCompilerTool"
195
+				Optimization="0"
196
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
197
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
198
+				MinimalRebuild="true"
199
+				BasicRuntimeChecks="3"
200
+				RuntimeLibrary="3"
201
+				UsePrecompiledHeader="0"
202
+				WarningLevel="3"
119 203
 				DebugInformationFormat="3"
204
+				CompileAs="1"
120 205
 				DisableSpecificWarnings="4996"
121
-				EnableFunctionLevelLinking="true"
122
-				EnableIntrinsicFunctions="true"
206
+			/>
207
+			<Tool
208
+				Name="VCManagedResourceCompilerTool"
209
+			/>
210
+			<Tool
211
+				Name="VCResourceCompilerTool"
212
+			/>
213
+			<Tool
214
+				Name="VCPreLinkEventTool"
215
+			/>
216
+			<Tool
217
+				Name="VCLinkerTool"
218
+				LinkIncremental="1"
219
+				GenerateDebugInformation="true"
220
+				SubSystem="1"
221
+				TargetMachine="17"
222
+			/>
223
+			<Tool
224
+				Name="VCALinkTool"
225
+			/>
226
+			<Tool
227
+				Name="VCManifestTool"
228
+			/>
229
+			<Tool
230
+				Name="VCXDCMakeTool"
231
+			/>
232
+			<Tool
233
+				Name="VCBscMakeTool"
234
+			/>
235
+			<Tool
236
+				Name="VCFxCopTool"
237
+			/>
238
+			<Tool
239
+				Name="VCAppVerifierTool"
240
+			/>
241
+			<Tool
242
+				Name="VCPostBuildEventTool"
243
+			/>
244
+		</Configuration>
245
+		<Configuration
246
+			Name="Release|x64"
247
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
248
+			IntermediateDirectory="$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
249
+			ConfigurationType="1"
250
+			CharacterSet="2"
251
+			WholeProgramOptimization="1"
252
+			>
253
+			<Tool
254
+				Name="VCPreBuildEventTool"
255
+			/>
256
+			<Tool
257
+				Name="VCCustomBuildTool"
258
+			/>
259
+			<Tool
260
+				Name="VCXMLDataGeneratorTool"
261
+			/>
262
+			<Tool
263
+				Name="VCWebServiceProxyGeneratorTool"
264
+			/>
265
+			<Tool
266
+				Name="VCMIDLTool"
267
+				TargetEnvironment="3"
268
+			/>
269
+			<Tool
123 270
 				Name="VCCLCompilerTool"
124 271
 				Optimization="2"
272
+				EnableIntrinsicFunctions="true"
273
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
125 274
 				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
126 275
 				RuntimeLibrary="2"
276
+				EnableFunctionLevelLinking="true"
127 277
 				UsePrecompiledHeader="0"
128 278
 				WarningLevel="3"
279
+				DebugInformationFormat="3"
280
+				CompileAs="1"
281
+				DisableSpecificWarnings="4996"
129 282
 			/>
130 283
 			<Tool
131 284
 				Name="VCManagedResourceCompilerTool"
... ...
@@ -137,13 +293,13 @@
137 137
 				Name="VCPreLinkEventTool"
138 138
 			/>
139 139
 			<Tool
140
-				EnableCOMDATFolding="2"
141
-				GenerateDebugInformation="true"
142
-				LinkIncremental="1"
143 140
 				Name="VCLinkerTool"
144
-				OptimizeReferences="2"
141
+				LinkIncremental="1"
142
+				GenerateDebugInformation="true"
145 143
 				SubSystem="1"
146
-				TargetMachine="1"
144
+				OptimizeReferences="2"
145
+				EnableCOMDATFolding="2"
146
+				TargetMachine="17"
147 147
 			/>
148 148
 			<Tool
149 149
 				Name="VCALinkTool"
... ...
@@ -172,8 +328,8 @@
172 172
 	</References>
173 173
 	<Files>
174 174
 		<Filter
175
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
176 175
 			Name="Source Files"
176
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
177 177
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
178 178
 			>
179 179
 			<File
... ...
@@ -210,8 +366,8 @@
210 210
 			>
211 211
 		</Filter>
212 212
 		<Filter
213
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
214 213
 			Name="Resource Files"
214
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
215 215
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
216 216
 			>
217 217
 			<File