Browse code

win32: vs10 done

aCaB authored on 2010/07/25 00:46:50
Showing 23 changed files
... ...
@@ -1,3 +1,7 @@
1
+Sat Jul 24 17:43:16 CEST 2010 (acab)
2
+------------------------------------
3
+ * win32: upgrade project files to vs10
4
+
1 5
 Fri Jul 23 22:32:18 EEST 2010 (edwin)
2 6
 -------------------------------------
3 7
  * libclamav/bytecode_vm.c: fix use of uninitialized value (bb #2140).
... ...
@@ -4,6 +4,8 @@ build
4 4
 *.ncb
5 5
 *.suo
6 6
 *.sdf
7
+*.opensdf
7 8
 *.user
8 9
 */Debug/*
9 10
 */Release/*
11
+ipch
... ...
@@ -69,73 +69,135 @@ EndProject
69 69
 Global
70 70
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
71 71
 		Debug|Win32 = Debug|Win32
72
+		Debug|x64 = Debug|x64
72 73
 		Release|Win32 = Release|Win32
74
+		Release|x64 = Release|x64
73 75
 	EndGlobalSection
74 76
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
75 77
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.ActiveCfg = Debug|Win32
76 78
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.Build.0 = Debug|Win32
79
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.ActiveCfg = Debug|x64
80
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.Build.0 = Debug|x64
77 81
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.ActiveCfg = Release|Win32
78 82
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.Build.0 = Release|Win32
83
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.ActiveCfg = Release|x64
84
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.Build.0 = Release|x64
79 85
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.ActiveCfg = Debug|Win32
80 86
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.Build.0 = Debug|Win32
87
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.ActiveCfg = Debug|x64
88
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.Build.0 = Debug|x64
81 89
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.ActiveCfg = Release|Win32
82 90
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.Build.0 = Release|Win32
91
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.ActiveCfg = Release|x64
92
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.Build.0 = Release|x64
83 93
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.ActiveCfg = Debug|Win32
84 94
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.Build.0 = Debug|Win32
95
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.ActiveCfg = Debug|x64
96
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.Build.0 = Debug|x64
85 97
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.ActiveCfg = Release|Win32
86 98
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.Build.0 = Release|Win32
99
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.ActiveCfg = Release|x64
100
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.Build.0 = Release|x64
87 101
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.ActiveCfg = Debug|Win32
88 102
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.Build.0 = Debug|Win32
103
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.ActiveCfg = Debug|x64
104
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.Build.0 = Debug|x64
89 105
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.ActiveCfg = Release|Win32
90 106
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.Build.0 = Release|Win32
107
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.ActiveCfg = Release|x64
108
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.Build.0 = Release|x64
91 109
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.ActiveCfg = Debug|Win32
92 110
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.Build.0 = Debug|Win32
111
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.ActiveCfg = Debug|x64
112
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.Build.0 = Debug|x64
93 113
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.ActiveCfg = Release|Win32
94 114
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.Build.0 = Release|Win32
115
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.ActiveCfg = Release|x64
116
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.Build.0 = Release|x64
95 117
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.ActiveCfg = Debug|Win32
96 118
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.Build.0 = Debug|Win32
119
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.ActiveCfg = Debug|x64
120
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.Build.0 = Debug|x64
97 121
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.ActiveCfg = Release|Win32
98 122
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.Build.0 = Release|Win32
123
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.ActiveCfg = Release|x64
124
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.Build.0 = Release|x64
99 125
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.ActiveCfg = Debug|Win32
100 126
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.Build.0 = Debug|Win32
127
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.ActiveCfg = Debug|x64
128
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.Build.0 = Debug|x64
101 129
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.ActiveCfg = Release|Win32
102 130
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.Build.0 = Release|Win32
131
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.ActiveCfg = Release|x64
132
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.Build.0 = Release|x64
103 133
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.ActiveCfg = Debug|Win32
104 134
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.Build.0 = Debug|Win32
135
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.ActiveCfg = Debug|x64
136
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.Build.0 = Debug|x64
105 137
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.ActiveCfg = Release|Win32
106 138
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.Build.0 = Release|Win32
139
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.ActiveCfg = Release|x64
140
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.Build.0 = Release|x64
107 141
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.ActiveCfg = Debug|Win32
108 142
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.Build.0 = Debug|Win32
143
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.ActiveCfg = Debug|x64
144
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.Build.0 = Debug|x64
109 145
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.ActiveCfg = Release|Win32
110 146
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.Build.0 = Release|Win32
147
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.ActiveCfg = Release|x64
148
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.Build.0 = Release|x64
111 149
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.ActiveCfg = Debug|Win32
112 150
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.Build.0 = Debug|Win32
151
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.ActiveCfg = Debug|x64
152
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.Build.0 = Debug|x64
113 153
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.ActiveCfg = Release|Win32
114 154
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.Build.0 = Release|Win32
155
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.ActiveCfg = Release|x64
156
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.Build.0 = Release|x64
115 157
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.ActiveCfg = Debug|Win32
116 158
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.Build.0 = Debug|Win32
159
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.ActiveCfg = Debug|x64
160
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.Build.0 = Debug|x64
117 161
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.ActiveCfg = Release|Win32
118 162
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.Build.0 = Release|Win32
163
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.ActiveCfg = Release|x64
164
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.Build.0 = Release|x64
119 165
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.ActiveCfg = Debug|Win32
120 166
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.Build.0 = Debug|Win32
167
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.ActiveCfg = Debug|x64
168
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.Build.0 = Debug|x64
121 169
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.ActiveCfg = Release|Win32
122 170
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.Build.0 = Release|Win32
171
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.ActiveCfg = Release|x64
172
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.Build.0 = Release|x64
123 173
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.ActiveCfg = Debug|Win32
124 174
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.Build.0 = Debug|Win32
175
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.ActiveCfg = Debug|x64
176
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.Build.0 = Debug|x64
125 177
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.ActiveCfg = Release|Win32
126 178
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.Build.0 = Release|Win32
179
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.ActiveCfg = Release|x64
180
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.Build.0 = Release|x64
127 181
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.ActiveCfg = Debug|Win32
128 182
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.Build.0 = Debug|Win32
183
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.ActiveCfg = Debug|x64
184
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.Build.0 = Debug|x64
129 185
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.ActiveCfg = Release|Win32
130 186
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.Build.0 = Release|Win32
187
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.ActiveCfg = Release|x64
188
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.Build.0 = Release|x64
131 189
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.ActiveCfg = Debug|Win32
132 190
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.Build.0 = Debug|Win32
191
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.ActiveCfg = Debug|x64
192
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.Build.0 = Debug|x64
133 193
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.ActiveCfg = Release|Win32
134 194
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.Build.0 = Release|Win32
195
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.ActiveCfg = Release|x64
196
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.Build.0 = Release|x64
135 197
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|Win32.ActiveCfg = Debug|Win32
136
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|Win32.Build.0 = Debug|Win32
198
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|x64.ActiveCfg = Debug|x64
137 199
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|Win32.ActiveCfg = Release|Win32
138
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|Win32.Build.0 = Release|Win32
200
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|x64.ActiveCfg = Release|x64
139 201
 	EndGlobalSection
140 202
 	GlobalSection(SolutionProperties) = preSolution
141 203
 		HideSolutionNode = FALSE
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <ItemGroup>
15 23
     <ClCompile Include="..\libclamav\c++\llvm\lib\CodeGen\LiveVariables.cpp"/>
... ...
@@ -146,30 +154,55 @@
146 146
     <UseDebugLibraries>true</UseDebugLibraries>
147 147
     <CharacterSet>MultiByte</CharacterSet>
148 148
   </PropertyGroup>
149
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
150
+    <ConfigurationType>StaticLibrary</ConfigurationType>
151
+    <UseDebugLibraries>true</UseDebugLibraries>
152
+    <CharacterSet>MultiByte</CharacterSet>
153
+  </PropertyGroup>
149 154
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
150 155
     <ConfigurationType>StaticLibrary</ConfigurationType>
151 156
     <UseDebugLibraries>false</UseDebugLibraries>
152 157
     <WholeProgramOptimization>true</WholeProgramOptimization>
153 158
     <CharacterSet>MultiByte</CharacterSet>
154 159
   </PropertyGroup>
160
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
161
+    <ConfigurationType>StaticLibrary</ConfigurationType>
162
+    <UseDebugLibraries>false</UseDebugLibraries>
163
+    <WholeProgramOptimization>true</WholeProgramOptimization>
164
+    <CharacterSet>MultiByte</CharacterSet>
165
+  </PropertyGroup>
155 166
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
156 167
   <ImportGroup Label="ExtensionSettings">
157 168
   </ImportGroup>
158 169
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
159 170
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
160 171
   </ImportGroup>
172
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
173
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
174
+  </ImportGroup>
161 175
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
162 176
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
163 177
   </ImportGroup>
178
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
179
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
180
+  </ImportGroup>
164 181
   <PropertyGroup Label="UserMacros"/>
165 182
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
166 183
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
167 184
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
168 185
   </PropertyGroup>
186
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
187
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
188
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
189
+  </PropertyGroup>
169 190
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
170 191
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
171 192
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
172 193
   </PropertyGroup>
194
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
195
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
196
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
197
+  </PropertyGroup>
173 198
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
174 199
     <ClCompile>
175 200
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -185,6 +218,21 @@
185 185
       <GenerateDebugInformation>true</GenerateDebugInformation>
186 186
     </Link>
187 187
   </ItemDefinitionGroup>
188
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
189
+    <ClCompile>
190
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
191
+      <WarningLevel>Level3</WarningLevel>
192
+      <Optimization>Disabled</Optimization>
193
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
195
+      <CompileAs>CompileAsCpp</CompileAs>
196
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
197
+    </ClCompile>
198
+    <Link>
199
+      <SubSystem>Windows</SubSystem>
200
+      <GenerateDebugInformation>true</GenerateDebugInformation>
201
+    </Link>
202
+  </ItemDefinitionGroup>
188 203
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
189 204
     <ClCompile>
190 205
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -204,6 +252,25 @@
204 204
       <OptimizeReferences>true</OptimizeReferences>
205 205
     </Link>
206 206
   </ItemDefinitionGroup>
207
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
208
+    <ClCompile>
209
+      <WarningLevel>Level3</WarningLevel>
210
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
211
+      <Optimization>MaxSpeed</Optimization>
212
+      <FunctionLevelLinking>true</FunctionLevelLinking>
213
+      <IntrinsicFunctions>true</IntrinsicFunctions>
214
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
215
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
216
+      <CompileAs>CompileAsCpp</CompileAs>
217
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
218
+    </ClCompile>
219
+    <Link>
220
+      <SubSystem>Windows</SubSystem>
221
+      <GenerateDebugInformation>true</GenerateDebugInformation>
222
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
223
+      <OptimizeReferences>true</OptimizeReferences>
224
+    </Link>
225
+  </ItemDefinitionGroup>
207 226
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
208 227
   <ImportGroup Label="ExtensionTargets">
209 228
   </ImportGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <ItemGroup>
15 23
     <ClCompile Include="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JIT.cpp"/>
... ...
@@ -126,30 +134,55 @@
126 126
     <UseDebugLibraries>true</UseDebugLibraries>
127 127
     <CharacterSet>MultiByte</CharacterSet>
128 128
   </PropertyGroup>
129
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
130
+    <ConfigurationType>StaticLibrary</ConfigurationType>
131
+    <UseDebugLibraries>true</UseDebugLibraries>
132
+    <CharacterSet>MultiByte</CharacterSet>
133
+  </PropertyGroup>
129 134
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
130 135
     <ConfigurationType>StaticLibrary</ConfigurationType>
131 136
     <UseDebugLibraries>false</UseDebugLibraries>
132 137
     <WholeProgramOptimization>true</WholeProgramOptimization>
133 138
     <CharacterSet>MultiByte</CharacterSet>
134 139
   </PropertyGroup>
140
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
141
+    <ConfigurationType>StaticLibrary</ConfigurationType>
142
+    <UseDebugLibraries>false</UseDebugLibraries>
143
+    <WholeProgramOptimization>true</WholeProgramOptimization>
144
+    <CharacterSet>MultiByte</CharacterSet>
145
+  </PropertyGroup>
135 146
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
136 147
   <ImportGroup Label="ExtensionSettings">
137 148
   </ImportGroup>
138 149
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
139 150
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
140 151
   </ImportGroup>
152
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
153
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
154
+  </ImportGroup>
141 155
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
142 156
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
143 157
   </ImportGroup>
158
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
159
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
160
+  </ImportGroup>
144 161
   <PropertyGroup Label="UserMacros"/>
145 162
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
146 163
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
147 164
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
148 165
   </PropertyGroup>
166
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
167
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
168
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
169
+  </PropertyGroup>
149 170
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
150 171
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
151 172
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
152 173
   </PropertyGroup>
174
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
175
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
176
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
177
+  </PropertyGroup>
153 178
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
154 179
     <ClCompile>
155 180
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -165,6 +198,21 @@
165 165
       <GenerateDebugInformation>true</GenerateDebugInformation>
166 166
     </Link>
167 167
   </ItemDefinitionGroup>
168
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
169
+    <ClCompile>
170
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
171
+      <WarningLevel>Level3</WarningLevel>
172
+      <Optimization>Disabled</Optimization>
173
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
174
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
175
+      <CompileAs>CompileAsCpp</CompileAs>
176
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503;4267</DisableSpecificWarnings>
177
+    </ClCompile>
178
+    <Link>
179
+      <SubSystem>Windows</SubSystem>
180
+      <GenerateDebugInformation>true</GenerateDebugInformation>
181
+    </Link>
182
+  </ItemDefinitionGroup>
168 183
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
169 184
     <ClCompile>
170 185
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -184,6 +232,25 @@
184 184
       <OptimizeReferences>true</OptimizeReferences>
185 185
     </Link>
186 186
   </ItemDefinitionGroup>
187
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
188
+    <ClCompile>
189
+      <WarningLevel>Level3</WarningLevel>
190
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
191
+      <Optimization>MaxSpeed</Optimization>
192
+      <FunctionLevelLinking>true</FunctionLevelLinking>
193
+      <IntrinsicFunctions>true</IntrinsicFunctions>
194
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
196
+      <CompileAs>CompileAsCpp</CompileAs>
197
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4503;4267</DisableSpecificWarnings>
198
+    </ClCompile>
199
+    <Link>
200
+      <SubSystem>Windows</SubSystem>
201
+      <GenerateDebugInformation>true</GenerateDebugInformation>
202
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
203
+      <OptimizeReferences>true</OptimizeReferences>
204
+    </Link>
205
+  </ItemDefinitionGroup>
187 206
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
188 207
   <ImportGroup Label="ExtensionTargets">
189 208
   </ImportGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <ItemGroup>
15 23
     <ClCompile Include="..\libclamav\c++\llvm\lib\System\Path.cpp"/>
... ...
@@ -41,30 +49,55 @@
41 41
     <UseDebugLibraries>true</UseDebugLibraries>
42 42
     <CharacterSet>MultiByte</CharacterSet>
43 43
   </PropertyGroup>
44
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
45
+    <ConfigurationType>StaticLibrary</ConfigurationType>
46
+    <UseDebugLibraries>true</UseDebugLibraries>
47
+    <CharacterSet>MultiByte</CharacterSet>
48
+  </PropertyGroup>
44 49
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
45 50
     <ConfigurationType>StaticLibrary</ConfigurationType>
46 51
     <UseDebugLibraries>false</UseDebugLibraries>
47 52
     <WholeProgramOptimization>true</WholeProgramOptimization>
48 53
     <CharacterSet>MultiByte</CharacterSet>
49 54
   </PropertyGroup>
55
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
56
+    <ConfigurationType>StaticLibrary</ConfigurationType>
57
+    <UseDebugLibraries>false</UseDebugLibraries>
58
+    <WholeProgramOptimization>true</WholeProgramOptimization>
59
+    <CharacterSet>MultiByte</CharacterSet>
60
+  </PropertyGroup>
50 61
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
51 62
   <ImportGroup Label="ExtensionSettings">
52 63
   </ImportGroup>
53 64
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
54 65
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
55 66
   </ImportGroup>
67
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
68
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
69
+  </ImportGroup>
56 70
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
57 71
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
58 72
   </ImportGroup>
73
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
74
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
75
+  </ImportGroup>
59 76
   <PropertyGroup Label="UserMacros"/>
60 77
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
61 78
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
62 79
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
63 80
   </PropertyGroup>
81
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
82
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
83
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
84
+  </PropertyGroup>
64 85
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
65 86
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66 87
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67 88
   </PropertyGroup>
89
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
90
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
91
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
92
+  </PropertyGroup>
68 93
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
69 94
     <ClCompile>
70 95
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -80,6 +113,21 @@
80 80
       <GenerateDebugInformation>true</GenerateDebugInformation>
81 81
     </Link>
82 82
   </ItemDefinitionGroup>
83
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
84
+    <ClCompile>
85
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
86
+      <WarningLevel>Level3</WarningLevel>
87
+      <Optimization>Disabled</Optimization>
88
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
90
+      <CompileAs>CompileAsCpp</CompileAs>
91
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
92
+    </ClCompile>
93
+    <Link>
94
+      <SubSystem>Windows</SubSystem>
95
+      <GenerateDebugInformation>true</GenerateDebugInformation>
96
+    </Link>
97
+  </ItemDefinitionGroup>
83 98
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
84 99
     <ClCompile>
85 100
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -99,6 +147,25 @@
99 99
       <OptimizeReferences>true</OptimizeReferences>
100 100
     </Link>
101 101
   </ItemDefinitionGroup>
102
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
103
+    <ClCompile>
104
+      <WarningLevel>Level3</WarningLevel>
105
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
106
+      <Optimization>MaxSpeed</Optimization>
107
+      <FunctionLevelLinking>true</FunctionLevelLinking>
108
+      <IntrinsicFunctions>true</IntrinsicFunctions>
109
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
110
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).."</AdditionalIncludeDirectories>
111
+      <CompileAs>CompileAsCpp</CompileAs>
112
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
113
+    </ClCompile>
114
+    <Link>
115
+      <SubSystem>Windows</SubSystem>
116
+      <GenerateDebugInformation>true</GenerateDebugInformation>
117
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
118
+      <OptimizeReferences>true</OptimizeReferences>
119
+    </Link>
120
+  </ItemDefinitionGroup>
102 121
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
103 122
   <ImportGroup Label="ExtensionTargets">
104 123
   </ImportGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <ItemGroup>
15 23
     <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86AsmBackend.cpp"/>
... ...
@@ -36,6 +44,13 @@
36 36
     <ClCompile Include="..\libclamav\c++\llvm\lib\Target\X86\X86TargetObjectFile.cpp"/>
37 37
     <ClCompile Include="..\libclamav\c++\llvm\lib\MC\MCAsmInfoCOFF.cpp"/>
38 38
   </ItemGroup>
39
+  <ItemGroup>
40
+    <MASM Include="..\libclamav\c++\llvm\lib\Target\X86\X86CompilationCallback_Win64.asm">
41
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
42
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
43
+      <FileType>Document</FileType>
44
+    </MASM>
45
+  </ItemGroup>
39 46
   <PropertyGroup Label="Globals">
40 47
     <ProjectGuid>{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}</ProjectGuid>
41 48
     <Keyword>Win32Proj</Keyword>
... ...
@@ -47,30 +62,56 @@
47 47
     <UseDebugLibraries>true</UseDebugLibraries>
48 48
     <CharacterSet>MultiByte</CharacterSet>
49 49
   </PropertyGroup>
50
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
51
+    <ConfigurationType>StaticLibrary</ConfigurationType>
52
+    <UseDebugLibraries>true</UseDebugLibraries>
53
+    <CharacterSet>MultiByte</CharacterSet>
54
+  </PropertyGroup>
50 55
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
51 56
     <ConfigurationType>StaticLibrary</ConfigurationType>
52 57
     <UseDebugLibraries>false</UseDebugLibraries>
53 58
     <WholeProgramOptimization>true</WholeProgramOptimization>
54 59
     <CharacterSet>MultiByte</CharacterSet>
55 60
   </PropertyGroup>
61
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
62
+    <ConfigurationType>StaticLibrary</ConfigurationType>
63
+    <UseDebugLibraries>false</UseDebugLibraries>
64
+    <WholeProgramOptimization>true</WholeProgramOptimization>
65
+    <CharacterSet>MultiByte</CharacterSet>
66
+  </PropertyGroup>
56 67
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
57 68
   <ImportGroup Label="ExtensionSettings">
69
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props"/>
58 70
   </ImportGroup>
59 71
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
60 72
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
61 73
   </ImportGroup>
74
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
75
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
76
+  </ImportGroup>
62 77
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
63 78
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
64 79
   </ImportGroup>
80
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
81
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
82
+  </ImportGroup>
65 83
   <PropertyGroup Label="UserMacros"/>
66 84
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
67 85
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
68 86
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
69 87
   </PropertyGroup>
88
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
89
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
90
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
91
+  </PropertyGroup>
70 92
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
71 93
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
72 94
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
73 95
   </PropertyGroup>
96
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
97
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
98
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
99
+  </PropertyGroup>
74 100
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
75 101
     <ClCompile>
76 102
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -86,6 +127,21 @@
86 86
       <GenerateDebugInformation>true</GenerateDebugInformation>
87 87
     </Link>
88 88
   </ItemDefinitionGroup>
89
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
90
+    <ClCompile>
91
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
92
+      <WarningLevel>Level3</WarningLevel>
93
+      <Optimization>Disabled</Optimization>
94
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
96
+      <CompileAs>CompileAsCpp</CompileAs>
97
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
98
+    </ClCompile>
99
+    <Link>
100
+      <SubSystem>Windows</SubSystem>
101
+      <GenerateDebugInformation>true</GenerateDebugInformation>
102
+    </Link>
103
+  </ItemDefinitionGroup>
89 104
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
90 105
     <ClCompile>
91 106
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -105,7 +161,27 @@
105 105
       <OptimizeReferences>true</OptimizeReferences>
106 106
     </Link>
107 107
   </ItemDefinitionGroup>
108
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
109
+    <ClCompile>
110
+      <WarningLevel>Level3</WarningLevel>
111
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
112
+      <Optimization>MaxSpeed</Optimization>
113
+      <FunctionLevelLinking>true</FunctionLevelLinking>
114
+      <IntrinsicFunctions>true</IntrinsicFunctions>
115
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include"</AdditionalIncludeDirectories>
117
+      <CompileAs>CompileAsCpp</CompileAs>
118
+      <DisableSpecificWarnings>4146;4800;4244;4996;4624;4355;4351;4267</DisableSpecificWarnings>
119
+    </ClCompile>
120
+    <Link>
121
+      <SubSystem>Windows</SubSystem>
122
+      <GenerateDebugInformation>true</GenerateDebugInformation>
123
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
124
+      <OptimizeReferences>true</OptimizeReferences>
125
+    </Link>
126
+  </ItemDefinitionGroup>
108 127
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
109 128
   <ImportGroup Label="ExtensionTargets">
129
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets"/>
110 130
   </ImportGroup>
111 131
 </Project>
... ...
@@ -77,4 +77,9 @@
77 77
       <Filter>Source Files</Filter>
78 78
     </ClCompile>
79 79
   </ItemGroup>
80
+  <ItemGroup>
81
+    <MASM Include="..\libclamav\c++\llvm\lib\Target\X86\X86CompilationCallback_Win64.asm">
82
+      <Filter>Source Files</Filter>
83
+    </MASM>
84
+  </ItemGroup>
80 85
 </Project>
81 86
\ No newline at end of file
... ...
@@ -5,14 +5,11 @@ 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 builds the 32bit target
8
+- Microsoft Visual Studio 2010: the express version builds the 32bit target
9 9
 just fine but it requires a decent amount of fiddling in order to compile
10 10
 the 64bit target; this configuration is therefore not supported.
11 11
 
12
-To run the binaries at least Windows 2000 is required. Microsoft Visual C++ 2008
13
-runtime libraries needs to be installed on the system. See:
14
-http://www.microsoft.com/downloads/details.aspx?familyid=9b2da534-3e03-4391-8a4d-074b9f2bc1bf&displaylang=en
15
-
12
+To run the binaries at least Windows 2000 is required.
16 13
 
17 14
 1- Getting the code
18 15
 
... ...
@@ -502,7 +502,7 @@
502 502
 /* #undef USE_SYSLOG */
503 503
 
504 504
 /* Version number of package */
505
-#define VERSION "devel-clamav-0.96-207-g3c3657d"
505
+#define VERSION "devel-clamav-0.96-209-g36263c7"
506 506
 
507 507
 /* Version suffix for package */
508 508
 #define VERSION_SUFFIX ""
... ...
@@ -5,10 +5,18 @@
5 5
       <Configuration>Debug</Configuration>
6 6
       <Platform>Win32</Platform>
7 7
     </ProjectConfiguration>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
11
+    </ProjectConfiguration>
8 12
     <ProjectConfiguration Include="Release|Win32">
9 13
       <Configuration>Release</Configuration>
10 14
       <Platform>Win32</Platform>
11 15
     </ProjectConfiguration>
16
+    <ProjectConfiguration Include="Release|x64">
17
+      <Configuration>Release</Configuration>
18
+      <Platform>x64</Platform>
19
+    </ProjectConfiguration>
12 20
   </ItemGroup>
13 21
   <PropertyGroup Label="Globals">
14 22
     <ProjectGuid>{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}</ProjectGuid>
... ...
@@ -21,21 +29,38 @@
21 21
     <UseDebugLibraries>true</UseDebugLibraries>
22 22
     <CharacterSet>MultiByte</CharacterSet>
23 23
   </PropertyGroup>
24
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
25
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
26
+    <UseDebugLibraries>true</UseDebugLibraries>
27
+    <CharacterSet>MultiByte</CharacterSet>
28
+  </PropertyGroup>
24 29
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25 30
     <ConfigurationType>DynamicLibrary</ConfigurationType>
26 31
     <UseDebugLibraries>false</UseDebugLibraries>
27 32
     <WholeProgramOptimization>true</WholeProgramOptimization>
28 33
     <CharacterSet>MultiByte</CharacterSet>
29 34
   </PropertyGroup>
35
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
36
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
37
+    <UseDebugLibraries>false</UseDebugLibraries>
38
+    <WholeProgramOptimization>true</WholeProgramOptimization>
39
+    <CharacterSet>MultiByte</CharacterSet>
40
+  </PropertyGroup>
30 41
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31 42
   <ImportGroup Label="ExtensionSettings">
32 43
   </ImportGroup>
33 44
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
34 45
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
35 46
   </ImportGroup>
47
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
48
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
49
+  </ImportGroup>
36 50
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
37 51
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
38 52
   </ImportGroup>
53
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
54
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55
+  </ImportGroup>
39 56
   <PropertyGroup Label="UserMacros" />
40 57
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
41 58
     <LinkIncremental>true</LinkIncremental>
... ...
@@ -43,12 +68,24 @@
43 43
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 44
     <TargetName>clamav</TargetName>
45 45
   </PropertyGroup>
46
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
47
+    <LinkIncremental>true</LinkIncremental>
48
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
49
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
50
+    <TargetName>clamav</TargetName>
51
+  </PropertyGroup>
46 52
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 53
     <LinkIncremental>false</LinkIncremental>
48 54
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
49 55
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
50 56
     <TargetName>clamav</TargetName>
51 57
   </PropertyGroup>
58
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
59
+    <LinkIncremental>false</LinkIncremental>
60
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
61
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
62
+    <TargetName>clamav</TargetName>
63
+  </PropertyGroup>
52 64
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
53 65
     <ClCompile>
54 66
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -65,6 +102,22 @@
65 65
       <DelayLoadDLLs>libclamav.dll</DelayLoadDLLs>
66 66
     </Link>
67 67
   </ItemDefinitionGroup>
68
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
69
+    <ClCompile>
70
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
71
+      <WarningLevel>Level3</WarningLevel>
72
+      <Optimization>Disabled</Optimization>
73
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;_DEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir).."</AdditionalIncludeDirectories>
75
+      <CompileAs>CompileAsC</CompileAs>
76
+      <DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
77
+    </ClCompile>
78
+    <Link>
79
+      <SubSystem>Windows</SubSystem>
80
+      <GenerateDebugInformation>true</GenerateDebugInformation>
81
+      <DelayLoadDLLs>libclamav.dll</DelayLoadDLLs>
82
+    </Link>
83
+  </ItemDefinitionGroup>
68 84
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
69 85
     <ClCompile>
70 86
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -85,6 +138,26 @@
85 85
       <DelayLoadDLLs>libclamav.dll</DelayLoadDLLs>
86 86
     </Link>
87 87
   </ItemDefinitionGroup>
88
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
89
+    <ClCompile>
90
+      <WarningLevel>Level3</WarningLevel>
91
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
92
+      <Optimization>MaxSpeed</Optimization>
93
+      <FunctionLevelLinking>true</FunctionLevelLinking>
94
+      <IntrinsicFunctions>true</IntrinsicFunctions>
95
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;CLAMAPI= __declspec(dllexport);WIN32;NDEBUG;_WINDOWS;_USRDLL;CLAMAVFORWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
96
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir).."</AdditionalIncludeDirectories>
97
+      <CompileAs>CompileAsC</CompileAs>
98
+      <DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
99
+    </ClCompile>
100
+    <Link>
101
+      <SubSystem>Windows</SubSystem>
102
+      <GenerateDebugInformation>true</GenerateDebugInformation>
103
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
104
+      <OptimizeReferences>true</OptimizeReferences>
105
+      <DelayLoadDLLs>libclamav.dll</DelayLoadDLLs>
106
+    </Link>
107
+  </ItemDefinitionGroup>
88 108
   <ItemGroup>
89 109
     <ClCompile Include="..\shared\output.c" />
90 110
     <ClCompile Include="clamav-for-windows\iface_errors.c" />
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{30BC968B-C4F7-4598-A672-AC69375C9155}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>Application</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>Application</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>Application</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -63,6 +98,21 @@
63 63
       <GenerateDebugInformation>true</GenerateDebugInformation>
64 64
     </Link>
65 65
   </ItemDefinitionGroup>
66
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
+    <ClCompile>
68
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
69
+      <WarningLevel>Level3</WarningLevel>
70
+      <Optimization>Disabled</Optimization>
71
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
73
+      <CompileAs>CompileAsC</CompileAs>
74
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
75
+    </ClCompile>
76
+    <Link>
77
+      <SubSystem>Console</SubSystem>
78
+      <GenerateDebugInformation>true</GenerateDebugInformation>
79
+    </Link>
80
+  </ItemDefinitionGroup>
66 81
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67 82
     <ClCompile>
68 83
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -82,6 +132,25 @@
82 82
       <OptimizeReferences>true</OptimizeReferences>
83 83
     </Link>
84 84
   </ItemDefinitionGroup>
85
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86
+    <ClCompile>
87
+      <WarningLevel>Level3</WarningLevel>
88
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
89
+      <Optimization>MaxSpeed</Optimization>
90
+      <FunctionLevelLinking>true</FunctionLevelLinking>
91
+      <IntrinsicFunctions>true</IntrinsicFunctions>
92
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
94
+      <CompileAs>CompileAsC</CompileAs>
95
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
96
+    </ClCompile>
97
+    <Link>
98
+      <SubSystem>Console</SubSystem>
99
+      <GenerateDebugInformation>true</GenerateDebugInformation>
100
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
101
+      <OptimizeReferences>true</OptimizeReferences>
102
+    </Link>
103
+  </ItemDefinitionGroup>
85 104
   <ItemGroup>
86 105
     <ClCompile Include="..\clambc\bcrun.c"/>
87 106
     <ClCompile Include="..\shared\misc.c"/>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{390D68E1-5228-40A8-9BE4-DD19026001B7}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>Application</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>Application</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>Application</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -63,6 +98,21 @@
63 63
       <GenerateDebugInformation>true</GenerateDebugInformation>
64 64
     </Link>
65 65
   </ItemDefinitionGroup>
66
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
+    <ClCompile>
68
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
69
+      <WarningLevel>Level3</WarningLevel>
70
+      <Optimization>Disabled</Optimization>
71
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
73
+      <CompileAs>CompileAsC</CompileAs>
74
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
75
+    </ClCompile>
76
+    <Link>
77
+      <SubSystem>Console</SubSystem>
78
+      <GenerateDebugInformation>true</GenerateDebugInformation>
79
+    </Link>
80
+  </ItemDefinitionGroup>
66 81
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67 82
     <ClCompile>
68 83
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -82,6 +132,25 @@
82 82
       <OptimizeReferences>true</OptimizeReferences>
83 83
     </Link>
84 84
   </ItemDefinitionGroup>
85
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86
+    <ClCompile>
87
+      <WarningLevel>Level3</WarningLevel>
88
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
89
+      <Optimization>MaxSpeed</Optimization>
90
+      <FunctionLevelLinking>true</FunctionLevelLinking>
91
+      <IntrinsicFunctions>true</IntrinsicFunctions>
92
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
94
+      <CompileAs>CompileAsC</CompileAs>
95
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
96
+    </ClCompile>
97
+    <Link>
98
+      <SubSystem>Console</SubSystem>
99
+      <GenerateDebugInformation>true</GenerateDebugInformation>
100
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
101
+      <OptimizeReferences>true</OptimizeReferences>
102
+    </Link>
103
+  </ItemDefinitionGroup>
85 104
   <ItemGroup>
86 105
     <ClCompile Include="..\clamconf\clamconf.c"/>
87 106
     <ClCompile Include="..\shared\misc.c"/>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{128DA45B-0628-42BB-BA90-8F836CA7FF25}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>Application</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>Application</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>Application</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -63,6 +98,21 @@
63 63
       <GenerateDebugInformation>true</GenerateDebugInformation>
64 64
     </Link>
65 65
   </ItemDefinitionGroup>
66
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
+    <ClCompile>
68
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
69
+      <WarningLevel>Level3</WarningLevel>
70
+      <Optimization>Disabled</Optimization>
71
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
73
+      <CompileAs>CompileAsC</CompileAs>
74
+      <DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings>
75
+    </ClCompile>
76
+    <Link>
77
+      <SubSystem>Console</SubSystem>
78
+      <GenerateDebugInformation>true</GenerateDebugInformation>
79
+    </Link>
80
+  </ItemDefinitionGroup>
66 81
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67 82
     <ClCompile>
68 83
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -82,6 +132,25 @@
82 82
       <OptimizeReferences>true</OptimizeReferences>
83 83
     </Link>
84 84
   </ItemDefinitionGroup>
85
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86
+    <ClCompile>
87
+      <WarningLevel>Level3</WarningLevel>
88
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
89
+      <Optimization>MaxSpeed</Optimization>
90
+      <FunctionLevelLinking>true</FunctionLevelLinking>
91
+      <IntrinsicFunctions>true</IntrinsicFunctions>
92
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
94
+      <CompileAs>CompileAsC</CompileAs>
95
+      <DisableSpecificWarnings>4996;4244;4090;4018;4101;4267</DisableSpecificWarnings>
96
+    </ClCompile>
97
+    <Link>
98
+      <SubSystem>Console</SubSystem>
99
+      <GenerateDebugInformation>true</GenerateDebugInformation>
100
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
101
+      <OptimizeReferences>true</OptimizeReferences>
102
+    </Link>
103
+  </ItemDefinitionGroup>
85 104
   <ItemGroup>
86 105
     <ResourceCompile Include="res\clamd.rc"/>
87 106
   </ItemGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{094B13E4-321B-479B-919F-FB84A0F0DA1F}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>Application</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>Application</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>Application</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -63,6 +98,21 @@
63 63
       <GenerateDebugInformation>true</GenerateDebugInformation>
64 64
     </Link>
65 65
   </ItemDefinitionGroup>
66
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
+    <ClCompile>
68
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
69
+      <WarningLevel>Level3</WarningLevel>
70
+      <Optimization>Disabled</Optimization>
71
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
73
+      <CompileAs>CompileAsC</CompileAs>
74
+      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
75
+    </ClCompile>
76
+    <Link>
77
+      <SubSystem>Console</SubSystem>
78
+      <GenerateDebugInformation>true</GenerateDebugInformation>
79
+    </Link>
80
+  </ItemDefinitionGroup>
66 81
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67 82
     <ClCompile>
68 83
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -82,6 +132,25 @@
82 82
       <OptimizeReferences>true</OptimizeReferences>
83 83
     </Link>
84 84
   </ItemDefinitionGroup>
85
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86
+    <ClCompile>
87
+      <WarningLevel>Level3</WarningLevel>
88
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
89
+      <Optimization>MaxSpeed</Optimization>
90
+      <FunctionLevelLinking>true</FunctionLevelLinking>
91
+      <IntrinsicFunctions>true</IntrinsicFunctions>
92
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
94
+      <CompileAs>CompileAsC</CompileAs>
95
+      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
96
+    </ClCompile>
97
+    <Link>
98
+      <SubSystem>Console</SubSystem>
99
+      <GenerateDebugInformation>true</GenerateDebugInformation>
100
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
101
+      <OptimizeReferences>true</OptimizeReferences>
102
+    </Link>
103
+  </ItemDefinitionGroup>
85 104
   <ItemGroup>
86 105
     <ResourceCompile Include="res\clamdscan.rc"/>
87 106
   </ItemGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>Application</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>Application</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>Application</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -63,6 +98,21 @@
63 63
       <GenerateDebugInformation>true</GenerateDebugInformation>
64 64
     </Link>
65 65
   </ItemDefinitionGroup>
66
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
+    <ClCompile>
68
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
69
+      <WarningLevel>Level3</WarningLevel>
70
+      <Optimization>Disabled</Optimization>
71
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
73
+      <CompileAs>CompileAsC</CompileAs>
74
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
75
+    </ClCompile>
76
+    <Link>
77
+      <SubSystem>Console</SubSystem>
78
+      <GenerateDebugInformation>true</GenerateDebugInformation>
79
+    </Link>
80
+  </ItemDefinitionGroup>
66 81
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67 82
     <ClCompile>
68 83
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -82,6 +132,25 @@
82 82
       <OptimizeReferences>true</OptimizeReferences>
83 83
     </Link>
84 84
   </ItemDefinitionGroup>
85
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86
+    <ClCompile>
87
+      <WarningLevel>Level3</WarningLevel>
88
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
89
+      <Optimization>MaxSpeed</Optimization>
90
+      <FunctionLevelLinking>true</FunctionLevelLinking>
91
+      <IntrinsicFunctions>true</IntrinsicFunctions>
92
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
94
+      <CompileAs>CompileAsC</CompileAs>
95
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>
96
+    </ClCompile>
97
+    <Link>
98
+      <SubSystem>Console</SubSystem>
99
+      <GenerateDebugInformation>true</GenerateDebugInformation>
100
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
101
+      <OptimizeReferences>true</OptimizeReferences>
102
+    </Link>
103
+  </ItemDefinitionGroup>
85 104
   <ItemGroup>
86 105
     <ResourceCompile Include="res\clamscan.rc"/>
87 106
   </ItemGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>Application</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>Application</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>Application</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -64,6 +99,22 @@
64 64
       <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
65 65
     </Link>
66 66
   </ItemDefinitionGroup>
67
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
68
+    <ClCompile>
69
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
70
+      <WarningLevel>Level3</WarningLevel>
71
+      <Optimization>Disabled</Optimization>
72
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
73
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
74
+      <CompileAs>CompileAsC</CompileAs>
75
+      <DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings>
76
+    </ClCompile>
77
+    <Link>
78
+      <SubSystem>Console</SubSystem>
79
+      <GenerateDebugInformation>true</GenerateDebugInformation>
80
+      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
81
+    </Link>
82
+  </ItemDefinitionGroup>
67 83
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
68 84
     <ClCompile>
69 85
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -84,6 +135,26 @@
84 84
       <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
85 85
     </Link>
86 86
   </ItemDefinitionGroup>
87
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
88
+    <ClCompile>
89
+      <WarningLevel>Level3</WarningLevel>
90
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
91
+      <Optimization>MaxSpeed</Optimization>
92
+      <FunctionLevelLinking>true</FunctionLevelLinking>
93
+      <IntrinsicFunctions>true</IntrinsicFunctions>
94
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
96
+      <CompileAs>CompileAsC</CompileAs>
97
+      <DisableSpecificWarnings>4996;4244;4101;4102;4018;4267</DisableSpecificWarnings>
98
+    </ClCompile>
99
+    <Link>
100
+      <SubSystem>Console</SubSystem>
101
+      <GenerateDebugInformation>true</GenerateDebugInformation>
102
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
103
+      <OptimizeReferences>true</OptimizeReferences>
104
+      <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
105
+    </Link>
106
+  </ItemDefinitionGroup>
87 107
   <ItemGroup>
88 108
     <ResourceCompile Include="res\freshclam.rc"/>
89 109
   </ItemGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{09D341E9-7372-46E9-B0D7-CAAF77984190}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>DynamicLibrary</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -65,6 +100,23 @@
65 65
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
66 66
     </Link>
67 67
   </ItemDefinitionGroup>
68
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
69
+    <ClCompile>
70
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
71
+      <WarningLevel>Level3</WarningLevel>
72
+      <Optimization>Disabled</Optimization>
73
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
75
+      <CompileAs>CompileAsC</CompileAs>
76
+      <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267</DisableSpecificWarnings>
77
+    </ClCompile>
78
+    <Link>
79
+      <SubSystem>Windows</SubSystem>
80
+      <GenerateDebugInformation>true</GenerateDebugInformation>
81
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
82
+      <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
83
+    </Link>
84
+  </ItemDefinitionGroup>
68 85
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
69 86
     <ClCompile>
70 87
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -86,6 +138,27 @@
86 86
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
87 87
     </Link>
88 88
   </ItemDefinitionGroup>
89
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
90
+    <ClCompile>
91
+      <WarningLevel>Level3</WarningLevel>
92
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
93
+      <Optimization>MaxSpeed</Optimization>
94
+      <FunctionLevelLinking>true</FunctionLevelLinking>
95
+      <IntrinsicFunctions>true</IntrinsicFunctions>
96
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
98
+      <CompileAs>CompileAsC</CompileAs>
99
+      <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146;4267</DisableSpecificWarnings>
100
+    </ClCompile>
101
+    <Link>
102
+      <SubSystem>Windows</SubSystem>
103
+      <GenerateDebugInformation>true</GenerateDebugInformation>
104
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
105
+      <OptimizeReferences>true</OptimizeReferences>
106
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
107
+      <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
108
+    </Link>
109
+  </ItemDefinitionGroup>
89 110
   <ItemGroup>
90 111
     <None Include="libclamav.def"/>
91 112
   </ItemGroup>
... ...
@@ -161,7 +234,9 @@
161 161
     <ClCompile Include="..\libclamav\mspack.c"/>
162 162
     <ClCompile Include="..\libclamav\nsis\bzlib.c">
163 163
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\nsis_bzlib</ObjectFileName>
164
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\nsis_bzlib</ObjectFileName>
164 165
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\nsis_bzlib</ObjectFileName>
166
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\nsis_bzlib</ObjectFileName>
165 167
     </ClCompile>
166 168
     <ClCompile Include="..\libclamav\nsis\infblock.c"/>
167 169
     <ClCompile Include="..\libclamav\nsis\nulsft.c"/>
... ...
@@ -209,11 +284,15 @@
209 209
     <ClCompile Include="3rdparty\bzip2\blocksort.c"/>
210 210
     <ClCompile Include="3rdparty\bzip2\bzlib.c">
211 211
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\bzip2_bzlib</ObjectFileName>
212
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\bzip2_bzlib</ObjectFileName>
212 213
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\bzip2_bzlib</ObjectFileName>
214
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\bzip2_bzlib</ObjectFileName>
213 215
     </ClCompile>
214 216
     <ClCompile Include="3rdparty\bzip2\compress.c">
215 217
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\compress_bzip2</ObjectFileName>
218
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\compress_bzip2</ObjectFileName>
216 219
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\compress_bzip2</ObjectFileName>
220
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\compress_bzip2</ObjectFileName>
217 221
     </ClCompile>
218 222
     <ClCompile Include="3rdparty\bzip2\crctable.c"/>
219 223
     <ClCompile Include="3rdparty\bzip2\decompress.c"/>
... ...
@@ -223,7 +302,9 @@
223 223
     <ClCompile Include="3rdparty\zlib\adler32.c"/>
224 224
     <ClCompile Include="3rdparty\zlib\compress.c">
225 225
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\compress_zlib</ObjectFileName>
226
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\compress_zlib</ObjectFileName>
226 227
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\compress_zlib</ObjectFileName>
228
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\compress_zlib</ObjectFileName>
227 229
     </ClCompile>
228 230
     <ClCompile Include="3rdparty\zlib\crc32.c"/>
229 231
     <ClCompile Include="3rdparty\zlib\deflate.c"/>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <ItemGroup>
15 23
     <ClCompile Include="..\libclamav\c++\bytecode2llvm.cpp"/>
... ...
@@ -26,30 +34,55 @@
26 26
     <UseDebugLibraries>true</UseDebugLibraries>
27 27
     <CharacterSet>MultiByte</CharacterSet>
28 28
   </PropertyGroup>
29
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
30
+    <ConfigurationType>StaticLibrary</ConfigurationType>
31
+    <UseDebugLibraries>true</UseDebugLibraries>
32
+    <CharacterSet>MultiByte</CharacterSet>
33
+  </PropertyGroup>
29 34
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
30 35
     <ConfigurationType>StaticLibrary</ConfigurationType>
31 36
     <UseDebugLibraries>false</UseDebugLibraries>
32 37
     <WholeProgramOptimization>true</WholeProgramOptimization>
33 38
     <CharacterSet>MultiByte</CharacterSet>
34 39
   </PropertyGroup>
40
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
41
+    <ConfigurationType>StaticLibrary</ConfigurationType>
42
+    <UseDebugLibraries>false</UseDebugLibraries>
43
+    <WholeProgramOptimization>true</WholeProgramOptimization>
44
+    <CharacterSet>MultiByte</CharacterSet>
45
+  </PropertyGroup>
35 46
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
36 47
   <ImportGroup Label="ExtensionSettings">
37 48
   </ImportGroup>
38 49
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
39 50
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
40 51
   </ImportGroup>
52
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
53
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
54
+  </ImportGroup>
41 55
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
42 56
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
43 57
   </ImportGroup>
58
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
59
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
60
+  </ImportGroup>
44 61
   <PropertyGroup Label="UserMacros"/>
45 62
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
46 63
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
47 64
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
48 65
   </PropertyGroup>
66
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
68
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
69
+  </PropertyGroup>
49 70
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
50 71
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
51 72
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
52 73
   </PropertyGroup>
74
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
53 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
54 79
     <ClCompile>
55 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -65,6 +98,21 @@
65 65
       <GenerateDebugInformation>true</GenerateDebugInformation>
66 66
     </Link>
67 67
   </ItemDefinitionGroup>
68
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
69
+    <ClCompile>
70
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
71
+      <WarningLevel>Level3</WarningLevel>
72
+      <Optimization>Disabled</Optimization>
73
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib"</AdditionalIncludeDirectories>
75
+      <CompileAs>CompileAsCpp</CompileAs>
76
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
77
+    </ClCompile>
78
+    <Link>
79
+      <SubSystem>Windows</SubSystem>
80
+      <GenerateDebugInformation>true</GenerateDebugInformation>
81
+    </Link>
82
+  </ItemDefinitionGroup>
68 83
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
69 84
     <ClCompile>
70 85
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -84,6 +132,25 @@
84 84
       <OptimizeReferences>true</OptimizeReferences>
85 85
     </Link>
86 86
   </ItemDefinitionGroup>
87
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
88
+    <ClCompile>
89
+      <WarningLevel>Level3</WarningLevel>
90
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
91
+      <Optimization>MaxSpeed</Optimization>
92
+      <FunctionLevelLinking>true</FunctionLevelLinking>
93
+      <IntrinsicFunctions>true</IntrinsicFunctions>
94
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib"</AdditionalIncludeDirectories>
96
+      <CompileAs>CompileAsCpp</CompileAs>
97
+      <DisableSpecificWarnings>4146;4800;4244;4996;4355;4267</DisableSpecificWarnings>
98
+    </ClCompile>
99
+    <Link>
100
+      <SubSystem>Windows</SubSystem>
101
+      <GenerateDebugInformation>true</GenerateDebugInformation>
102
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
103
+      <OptimizeReferences>true</OptimizeReferences>
104
+    </Link>
105
+  </ItemDefinitionGroup>
87 106
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
88 107
   <ImportGroup Label="ExtensionTargets">
89 108
   </ImportGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>DynamicLibrary</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -64,6 +99,22 @@
64 64
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
65 65
     </Link>
66 66
   </ItemDefinitionGroup>
67
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
68
+    <ClCompile>
69
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
70
+      <WarningLevel>Level3</WarningLevel>
71
+      <Optimization>Disabled</Optimization>
72
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
73
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads"</AdditionalIncludeDirectories>
74
+      <DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings>
75
+      <CompileAs>CompileAsC</CompileAs>
76
+    </ClCompile>
77
+    <Link>
78
+      <SubSystem>Windows</SubSystem>
79
+      <GenerateDebugInformation>true</GenerateDebugInformation>
80
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
81
+    </Link>
82
+  </ItemDefinitionGroup>
67 83
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
68 84
     <ClCompile>
69 85
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -84,6 +135,26 @@
84 84
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
85 85
     </Link>
86 86
   </ItemDefinitionGroup>
87
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
88
+    <ClCompile>
89
+      <WarningLevel>Level3</WarningLevel>
90
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
91
+      <Optimization>MaxSpeed</Optimization>
92
+      <FunctionLevelLinking>true</FunctionLevelLinking>
93
+      <IntrinsicFunctions>true</IntrinsicFunctions>
94
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads"</AdditionalIncludeDirectories>
96
+      <DisableSpecificWarnings>4996;4018;4146;4244;4267</DisableSpecificWarnings>
97
+      <CompileAs>CompileAsC</CompileAs>
98
+    </ClCompile>
99
+    <Link>
100
+      <SubSystem>Windows</SubSystem>
101
+      <GenerateDebugInformation>true</GenerateDebugInformation>
102
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
103
+      <OptimizeReferences>true</OptimizeReferences>
104
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
105
+    </Link>
106
+  </ItemDefinitionGroup>
87 107
   <ItemGroup>
88 108
     <None Include="libclamunrar.def"/>
89 109
   </ItemGroup>
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{2E93DF6C-3C8A-4768-9539-12FB67417224}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>DynamicLibrary</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
44 61
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
66
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
49 71
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
76
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -66,6 +101,24 @@
66 66
     <ProjectReference/>
67 67
     <ProjectReference/>
68 68
   </ItemDefinitionGroup>
69
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
70
+    <ClCompile>
71
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
72
+      <WarningLevel>Level3</WarningLevel>
73
+      <Optimization>Disabled</Optimization>
74
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
75
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads"</AdditionalIncludeDirectories>
76
+      <DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
77
+      <CompileAs>CompileAsC</CompileAs>
78
+    </ClCompile>
79
+    <Link>
80
+      <SubSystem>Windows</SubSystem>
81
+      <GenerateDebugInformation>true</GenerateDebugInformation>
82
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
83
+    </Link>
84
+    <ProjectReference/>
85
+    <ProjectReference/>
86
+  </ItemDefinitionGroup>
69 87
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
70 88
     <ClCompile>
71 89
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -88,6 +141,28 @@
88 88
     <ProjectReference/>
89 89
     <ProjectReference/>
90 90
   </ItemDefinitionGroup>
91
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
92
+    <ClCompile>
93
+      <WarningLevel>Level3</WarningLevel>
94
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
95
+      <Optimization>MaxSpeed</Optimization>
96
+      <FunctionLevelLinking>true</FunctionLevelLinking>
97
+      <IntrinsicFunctions>true</IntrinsicFunctions>
98
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads"</AdditionalIncludeDirectories>
100
+      <DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
101
+      <CompileAs>CompileAsC</CompileAs>
102
+    </ClCompile>
103
+    <Link>
104
+      <SubSystem>Windows</SubSystem>
105
+      <GenerateDebugInformation>true</GenerateDebugInformation>
106
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
107
+      <OptimizeReferences>true</OptimizeReferences>
108
+      <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
109
+    </Link>
110
+    <ProjectReference/>
111
+    <ProjectReference/>
112
+  </ItemDefinitionGroup>
91 113
   <ItemGroup>
92 114
     <None Include="libclamunrar_iface.def"/>
93 115
   </ItemGroup>
... ...
@@ -6,8 +6,8 @@
6 6
 #define REPO_VERSION VERSION
7 7
 #endif
8 8
 
9
-#define RES_VER_Q 0,96,0,3
10
-#define RES_VER_S "ClamAV 0.96"
9
+#define RES_VER_Q 0,96,2,0
10
+#define RES_VER_S "ClamAV 0.96.2"
11 11
 
12 12
 VS_VERSION_INFO VERSIONINFO
13 13
     FILEVERSION RES_VER_Q
... ...
@@ -6,10 +6,18 @@
6 6
       <Configuration>Debug</Configuration>
7 7
       <Platform>Win32</Platform>
8 8
     </ProjectConfiguration>
9
+    <ProjectConfiguration Include="Debug|x64">
10
+      <Configuration>Debug</Configuration>
11
+      <Platform>x64</Platform>
12
+    </ProjectConfiguration>
9 13
     <ProjectConfiguration Include="Release|Win32">
10 14
       <Configuration>Release</Configuration>
11 15
       <Platform>Win32</Platform>
12 16
     </ProjectConfiguration>
17
+    <ProjectConfiguration Include="Release|x64">
18
+      <Configuration>Release</Configuration>
19
+      <Platform>x64</Platform>
20
+    </ProjectConfiguration>
13 21
   </ItemGroup>
14 22
   <PropertyGroup Label="Globals">
15 23
     <ProjectGuid>{05957B93-39F9-45EC-87BD-86B7AF571557}</ProjectGuid>
... ...
@@ -22,32 +30,59 @@
22 22
     <UseDebugLibraries>true</UseDebugLibraries>
23 23
     <CharacterSet>MultiByte</CharacterSet>
24 24
   </PropertyGroup>
25
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
26
+    <ConfigurationType>Application</ConfigurationType>
27
+    <UseDebugLibraries>true</UseDebugLibraries>
28
+    <CharacterSet>MultiByte</CharacterSet>
29
+  </PropertyGroup>
25 30
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26 31
     <ConfigurationType>Application</ConfigurationType>
27 32
     <UseDebugLibraries>false</UseDebugLibraries>
28 33
     <WholeProgramOptimization>true</WholeProgramOptimization>
29 34
     <CharacterSet>MultiByte</CharacterSet>
30 35
   </PropertyGroup>
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
+    <ConfigurationType>Application</ConfigurationType>
38
+    <UseDebugLibraries>false</UseDebugLibraries>
39
+    <WholeProgramOptimization>true</WholeProgramOptimization>
40
+    <CharacterSet>MultiByte</CharacterSet>
41
+  </PropertyGroup>
31 42
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
32 43
   <ImportGroup Label="ExtensionSettings">
33 44
   </ImportGroup>
34 45
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
35 46
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
36 47
   </ImportGroup>
48
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
49
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
50
+  </ImportGroup>
37 51
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
38 52
     <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
39 53
   </ImportGroup>
54
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
56
+  </ImportGroup>
40 57
   <PropertyGroup Label="UserMacros"/>
41 58
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42 59
     <LinkIncremental>true</LinkIncremental>
43 60
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
44 61
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
45 62
   </PropertyGroup>
63
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64
+    <LinkIncremental>true</LinkIncremental>
65
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
66
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
67
+  </PropertyGroup>
46 68
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 69
     <LinkIncremental>false</LinkIncremental>
48 70
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
49 71
     <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
50 72
   </PropertyGroup>
73
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74
+    <LinkIncremental>false</LinkIncremental>
75
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
76
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
77
+  </PropertyGroup>
51 78
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 79
     <ClCompile>
53 80
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
... ...
@@ -63,6 +98,21 @@
63 63
       <GenerateDebugInformation>true</GenerateDebugInformation>
64 64
     </Link>
65 65
   </ItemDefinitionGroup>
66
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67
+    <ClCompile>
68
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
69
+      <WarningLevel>Level3</WarningLevel>
70
+      <Optimization>Disabled</Optimization>
71
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
73
+      <CompileAs>CompileAsC</CompileAs>
74
+      <DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings>
75
+    </ClCompile>
76
+    <Link>
77
+      <SubSystem>Console</SubSystem>
78
+      <GenerateDebugInformation>true</GenerateDebugInformation>
79
+    </Link>
80
+  </ItemDefinitionGroup>
66 81
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67 82
     <ClCompile>
68 83
       <WarningLevel>Level3</WarningLevel>
... ...
@@ -82,6 +132,25 @@
82 82
       <OptimizeReferences>true</OptimizeReferences>
83 83
     </Link>
84 84
   </ItemDefinitionGroup>
85
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86
+    <ClCompile>
87
+      <WarningLevel>Level3</WarningLevel>
88
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
89
+      <Optimization>MaxSpeed</Optimization>
90
+      <FunctionLevelLinking>true</FunctionLevelLinking>
91
+      <IntrinsicFunctions>true</IntrinsicFunctions>
92
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93
+      <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories>
94
+      <CompileAs>CompileAsC</CompileAs>
95
+      <DisableSpecificWarnings>4996;4101;4244;4018;4267</DisableSpecificWarnings>
96
+    </ClCompile>
97
+    <Link>
98
+      <SubSystem>Console</SubSystem>
99
+      <GenerateDebugInformation>true</GenerateDebugInformation>
100
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
101
+      <OptimizeReferences>true</OptimizeReferences>
102
+    </Link>
103
+  </ItemDefinitionGroup>
85 104
   <ItemGroup>
86 105
     <ResourceCompile Include="res\sigtool.rc"/>
87 106
   </ItemGroup>