From 79b6015287d5f6df72b00f0769080d202a2792d4 Mon Sep 17 00:00:00 2001
From: "Micah Snyder (micasnyd)" <micasnyd@cisco.com>
Date: Tue, 22 May 2018 05:27:24 -0700
Subject: [PATCH] Explicitely building 3rdparty/pthreads-win32 as a separate
 DLL and dynamically linking it with libclamav.

---
 win32/ClamAV.sln                 |  11 +
 win32/Setup-x64/Setup-x64.vdproj |  50 +++-
 win32/Setup-x86/Setup-x86.vdproj | 216 ++++++++-------
 win32/libclamav.vcxproj          |   9 +-
 win32/libclamav.vcxproj.filters  |   3 -
 win32/pthreads.vcxproj           | 175 ++++++++++++
 win32/pthreads.vcxproj.filters   | 459 +++++++++++++++++++++++++++++++
 7 files changed, 806 insertions(+), 117 deletions(-)
 create mode 100644 win32/pthreads.vcxproj
 create mode 100644 win32/pthreads.vcxproj.filters

diff --git a/win32/ClamAV.sln b/win32/ClamAV.sln
index 5e0b522d4..bea703980 100644
--- a/win32/ClamAV.sln
+++ b/win32/ClamAV.sln
@@ -23,6 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamav", "libclamav.vcxp
 	ProjectSection(ProjectDependencies) = postProject
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB} = {3AE8051D-A188-4B11-95A4-14B8F0C290CB}
 		{AA443662-4AED-4F50-95E4-9B5BB5429E9E} = {AA443662-4AED-4F50-95E4-9B5BB5429E9E}
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C} = {56424F95-3DE6-429D-8D80-7F57CCE9209C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigtool", "sigtool.vcxproj", "{05957B93-39F9-45EC-87BD-86B7AF571557}"
@@ -75,6 +76,8 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x64", "Setup-x64\Setu
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x86", "Setup-x86\Setup-x86.vdproj", "{17F29B6A-389D-44DB-AC8B-9349EA7DBACE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads", "pthreads.vcxproj", "{56424F95-3DE6-429D-8D80-7F57CCE9209C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -231,6 +234,14 @@ Global
 		{17F29B6A-389D-44DB-AC8B-9349EA7DBACE}.Release|Win32.ActiveCfg = Release
 		{17F29B6A-389D-44DB-AC8B-9349EA7DBACE}.Release|Win32.Build.0 = Release
 		{17F29B6A-389D-44DB-AC8B-9349EA7DBACE}.Release|x64.ActiveCfg = Release
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Debug|Win32.Build.0 = Debug|Win32
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Debug|x64.ActiveCfg = Debug|x64
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Debug|x64.Build.0 = Debug|x64
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Release|Win32.ActiveCfg = Release|Win32
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Release|Win32.Build.0 = Release|Win32
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Release|x64.ActiveCfg = Release|x64
+		{56424F95-3DE6-429D-8D80-7F57CCE9209C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32/Setup-x64/Setup-x64.vdproj b/win32/Setup-x64/Setup-x64.vdproj
index 716ced07a..f1fe4543f 100755
--- a/win32/Setup-x64/Setup-x64.vdproj
+++ b/win32/Setup-x64/Setup-x64.vdproj
@@ -63,12 +63,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_65E3B3F3FCEB43AE9FDCAC06686B4E2C"
-        "OwnerKey" = "8:_804379F8A48A4F7DBB50D72302559297"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_671D69A7B15349CF8AE7C0075C51AF53"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -99,6 +93,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_7995E732E0F94150B596C90C659E88DF"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_7F93817BA09242BBA5B1DE77746F85EE"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -123,6 +123,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_AE55F79902BE4F90AC09D6D78FEAF55E"
+        "OwnerKey" = "8:_7995E732E0F94150B596C90C659E88DF"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_C0DFAFFC11514B9190D3A585C3E58832"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -612,7 +618,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:ClamAV"
         "ProductCode" = "8:{B29C0EBE-9FAF-4F8C-8044-F6A92F8506D8}"
-        "PackageCode" = "8:{B42DCD94-4BDA-40A8-AF0A-829EA38DB69E}"
+        "PackageCode" = "8:{70C21A9E-655D-4C8B-9481-AEA8B6E93D4C}"
         "UpgradeCode" = "8:{D35B7E07-D7B1-404B-A0C3-FBB599A1D58B}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -1128,7 +1134,7 @@
         }
         "MergeModule"
         {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_65E3B3F3FCEB43AE9FDCAC06686B4E2C"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AE55F79902BE4F90AC09D6D78FEAF55E"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
@@ -1285,6 +1291,34 @@
                 {
                 }
             }
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7995E732E0F94150B596C90C659E88DF"
+            {
+            "SourcePath" = "8:..\\x64\\Release\\pthreads.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{56424F95-3DE6-429D-8D80-7F57CCE9209C}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7F93817BA09242BBA5B1DE77746F85EE"
             {
             "SourcePath" = "8:..\\x64\\Release\\mspack.dll"
diff --git a/win32/Setup-x86/Setup-x86.vdproj b/win32/Setup-x86/Setup-x86.vdproj
index 467d49fa3..27f102edb 100755
--- a/win32/Setup-x86/Setup-x86.vdproj
+++ b/win32/Setup-x86/Setup-x86.vdproj
@@ -13,6 +13,12 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
+        "Entry"
+        {
+        "MsmKey" = "8:_0AFD526B35379541BF81B7EC151A454C"
+        "OwnerKey" = "8:_2D5F72DD435D4087BB93566626C4DAA4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_0BAEAA09548C4551BB507ED0A287BFF7"
@@ -27,8 +33,8 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_12BC851BCD7ED0B5DE2452E089FE060E"
-        "OwnerKey" = "8:_5F49C9D74EC64A6DB334CAD85B00B844"
+        "MsmKey" = "8:_1263551AA1F6DDEDF7350A11DF3610A8"
+        "OwnerKey" = "8:_2D5F72DD435D4087BB93566626C4DAA4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -63,32 +69,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_3AE0483642CAE89AB530A3BFAD1FE237"
-        "OwnerKey" = "8:_5F49C9D74EC64A6DB334CAD85B00B844"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_3D8905CACB1B4C45B76D8C27DA8AB71F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_3E4EE76708E96AEA25AB1F603BB4261C"
-        "OwnerKey" = "8:_5F49C9D74EC64A6DB334CAD85B00B844"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_49EB8577CD164925A62E7C391F0E755D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4BB75676FC79A4DAD9AF3A1136169FBF"
-        "OwnerKey" = "8:_5F49C9D74EC64A6DB334CAD85B00B844"
+        "MsmKey" = "8:_4DFD7BF984264BD9A322E794DCFE0175"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -105,6 +99,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_55D1C399E794015F52493C240AB0421C"
+        "OwnerKey" = "8:_2D5F72DD435D4087BB93566626C4DAA4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_599392474477437D93D28AD6E3AF35EA"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -141,26 +141,26 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_9C58F4CAFC224C04A16EB53D06C4C24E"
-        "OwnerKey" = "8:_5F49C9D74EC64A6DB334CAD85B00B844"
+        "MsmKey" = "8:_AB2127663D62467FA1B487FCD4452698"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_AB2127663D62467FA1B487FCD4452698"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_B9F70C517C0CCF01CFBFC22F77357E5F"
+        "OwnerKey" = "8:_2D5F72DD435D4087BB93566626C4DAA4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B21E3A9D494A2A59B0B84B8229DF4DD0"
-        "OwnerKey" = "8:_5F49C9D74EC64A6DB334CAD85B00B844"
+        "MsmKey" = "8:_C17F59D732312C77AF68940ECF104F3A"
+        "OwnerKey" = "8:_2D5F72DD435D4087BB93566626C4DAA4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B48212E67D69DD27401FB655EA77FA60"
-        "OwnerKey" = "8:_5F49C9D74EC64A6DB334CAD85B00B844"
+        "MsmKey" = "8:_C35802E3801758772052BA9EE7E1A06D"
+        "OwnerKey" = "8:_2D5F72DD435D4087BB93566626C4DAA4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -292,6 +292,26 @@
         }
         "File"
         {
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0AFD526B35379541BF81B7EC151A454C"
+            {
+            "SourcePath" = "8:LLVMx86codegen.lib"
+            "TargetName" = "8:LLVMx86codegen.lib"
+            "Tag" = "8:"
+            "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0BAEAA09548C4551BB507ED0A287BFF7"
             {
             "SourcePath" = "8:..\\..\\COPYING.LGPL"
@@ -332,10 +352,10 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_12BC851BCD7ED0B5DE2452E089FE060E"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1263551AA1F6DDEDF7350A11DF3610A8"
             {
-            "SourcePath" = "8:LLVMcodegen.lib"
-            "TargetName" = "8:LLVMcodegen.lib"
+            "SourcePath" = "8:libclamav.dll"
+            "TargetName" = "8:libclamav.dll"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
             "Condition" = "8:"
@@ -412,26 +432,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3AE0483642CAE89AB530A3BFAD1FE237"
-            {
-            "SourcePath" = "8:LLVMsystem.lib"
-            "TargetName" = "8:LLVMsystem.lib"
-            "Tag" = "8:"
-            "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D8905CACB1B4C45B76D8C27DA8AB71F"
             {
             "SourcePath" = "8:..\\conf_examples\\clamd.conf.sample"
@@ -452,12 +452,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3E4EE76708E96AEA25AB1F603BB4261C"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_49EB8577CD164925A62E7C391F0E755D"
             {
-            "SourcePath" = "8:libclamavcxx.lib"
-            "TargetName" = "8:libclamavcxx.lib"
+            "SourcePath" = "8:..\\..\\COPYING.lzma"
+            "TargetName" = "8:COPYING.lzma"
             "Tag" = "8:"
-            "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
+            "Folder" = "8:_CC739FAEDF984CEAB76629333F010ECC"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -469,13 +469,13 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_49EB8577CD164925A62E7C391F0E755D"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_555A18D4E1A14F0B86F24C668B83C1D3"
             {
-            "SourcePath" = "8:..\\..\\COPYING.lzma"
-            "TargetName" = "8:COPYING.lzma"
+            "SourcePath" = "8:..\\..\\COPYING.zlib"
+            "TargetName" = "8:COPYING.zlib"
             "Tag" = "8:"
             "Folder" = "8:_CC739FAEDF984CEAB76629333F010ECC"
             "Condition" = "8:"
@@ -492,10 +492,10 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4BB75676FC79A4DAD9AF3A1136169FBF"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_55D1C399E794015F52493C240AB0421C"
             {
-            "SourcePath" = "8:libclamav.dll"
-            "TargetName" = "8:libclamav.dll"
+            "SourcePath" = "8:LLVMcodegen.lib"
+            "TargetName" = "8:LLVMcodegen.lib"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
             "Condition" = "8:"
@@ -512,10 +512,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_555A18D4E1A14F0B86F24C668B83C1D3"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5FE155819306476DBA0496B696392858"
             {
-            "SourcePath" = "8:..\\..\\COPYING.zlib"
-            "TargetName" = "8:COPYING.zlib"
+            "SourcePath" = "8:..\\..\\COPYING.llvm"
+            "TargetName" = "8:COPYING.llvm"
             "Tag" = "8:"
             "Folder" = "8:_CC739FAEDF984CEAB76629333F010ECC"
             "Condition" = "8:"
@@ -532,12 +532,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5FE155819306476DBA0496B696392858"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DCD50FBC5504FBFB541E8A190A4464C"
             {
-            "SourcePath" = "8:..\\..\\COPYING.llvm"
-            "TargetName" = "8:COPYING.llvm"
+            "SourcePath" = "8:..\\conf_examples\\freshclam.conf.sample"
+            "TargetName" = "8:freshclam.conf.sample"
             "Tag" = "8:"
-            "Folder" = "8:_CC739FAEDF984CEAB76629333F010ECC"
+            "Folder" = "8:_26AB14DD8389433BB16AFBF9E7EAC70F"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -552,12 +552,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DCD50FBC5504FBFB541E8A190A4464C"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B9F70C517C0CCF01CFBFC22F77357E5F"
             {
-            "SourcePath" = "8:..\\conf_examples\\freshclam.conf.sample"
-            "TargetName" = "8:freshclam.conf.sample"
+            "SourcePath" = "8:libclamavcxx.lib"
+            "TargetName" = "8:libclamavcxx.lib"
             "Tag" = "8:"
-            "Folder" = "8:_26AB14DD8389433BB16AFBF9E7EAC70F"
+            "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -569,13 +569,13 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B21E3A9D494A2A59B0B84B8229DF4DD0"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C17F59D732312C77AF68940ECF104F3A"
             {
-            "SourcePath" = "8:LLVMx86codegen.lib"
-            "TargetName" = "8:LLVMx86codegen.lib"
+            "SourcePath" = "8:LLVMjit.lib"
+            "TargetName" = "8:LLVMjit.lib"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
             "Condition" = "8:"
@@ -592,10 +592,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B48212E67D69DD27401FB655EA77FA60"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C35802E3801758772052BA9EE7E1A06D"
             {
-            "SourcePath" = "8:LLVMjit.lib"
-            "TargetName" = "8:LLVMjit.lib"
+            "SourcePath" = "8:LLVMsystem.lib"
+            "TargetName" = "8:LLVMsystem.lib"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
             "Condition" = "8:"
@@ -1276,20 +1276,6 @@
         }
         "MergeModule"
         {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_9C58F4CAFC224C04A16EB53D06C4C24E"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:microsoft_vc140_crt_x86.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
         }
         "ProjectOutput"
         {
@@ -1323,7 +1309,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2D5F72DD435D4087BB93566626C4DAA4"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\freshclam.exe"
+            "SourcePath" = "8:..\\x64\\Release\\freshclam.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1351,7 +1337,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3959B729B9134312841F1DF3AB446E41"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\libclamunrar_iface.dll"
+            "SourcePath" = "8:..\\x64\\Release\\libclamunrar_iface.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1377,9 +1363,37 @@
                 {
                 }
             }
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4DFD7BF984264BD9A322E794DCFE0175"
+            {
+            "SourcePath" = "8:..\\x64\\Release\\pthreads.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{56424F95-3DE6-429D-8D80-7F57CCE9209C}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4F9EAE75D9F54661A41CBDCECF88FB52"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\clamdscan.exe"
+            "SourcePath" = "8:..\\x64\\Release\\clamdscan.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1407,7 +1421,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_599392474477437D93D28AD6E3AF35EA"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\libclamav.dll"
+            "SourcePath" = "8:..\\x64\\Release\\libclamav.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1435,7 +1449,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5D81AC6E135340ACA6C5E0BC7589F04E"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\libclamunrar.dll"
+            "SourcePath" = "8:..\\x64\\Release\\libclamunrar.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1463,7 +1477,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5F49C9D74EC64A6DB334CAD85B00B844"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\clambc.exe"
+            "SourcePath" = "8:..\\x64\\Release\\clambc.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1491,7 +1505,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9A6CED3B296740CA91B217A955CEE07E"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\sigtool.exe"
+            "SourcePath" = "8:..\\x64\\Release\\sigtool.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1519,7 +1533,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AB2127663D62467FA1B487FCD4452698"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\clamscan.exe"
+            "SourcePath" = "8:..\\x64\\Release\\clamscan.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1547,7 +1561,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C4E54BCE902B47C8A7EB65236130C306"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\mspack.dll"
+            "SourcePath" = "8:..\\x64\\Release\\mspack.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1575,7 +1589,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D55FC9202EDE4E5CABB1775DB894F555"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\clamd.exe"
+            "SourcePath" = "8:..\\x64\\Release\\clamd.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
@@ -1603,7 +1617,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E39CDB3FE24A4A34882D9056391E786C"
             {
-            "SourcePath" = "8:..\\Win32\\Release\\clamconf.exe"
+            "SourcePath" = "8:..\\x64\\Release\\clamconf.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_008B7C8409804955AA838A24FDF47F97"
diff --git a/win32/libclamav.vcxproj b/win32/libclamav.vcxproj
index a3466203f..8298b01e8 100644
--- a/win32/libclamav.vcxproj
+++ b/win32/libclamav.vcxproj
@@ -133,7 +133,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mspack.lib;ws2_32.lib;pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
@@ -151,7 +151,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mspack.lib;ws2_32.lib;pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
@@ -173,7 +173,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mspack.lib;ws2_32.lib;pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib</AdditionalLibraryDirectories>
     </Link>
@@ -217,7 +217,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>mspack.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mspack.lib;ws2_32.lib;pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
@@ -587,7 +587,6 @@
     <ClCompile Include="3rdparty\pcre\pcre_valid_utf8.c" />
     <ClCompile Include="3rdparty\pcre\pcre_version.c" />
     <ClCompile Include="3rdparty\pcre\pcre_xclass.c" />
-    <ClCompile Include="3rdparty\pthreads\pthread.c" />
     <ClCompile Include="3rdparty\zlib\adler32.c" />
     <ClCompile Include="3rdparty\zlib\compress.c">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\compress_zlib</ObjectFileName>
diff --git a/win32/libclamav.vcxproj.filters b/win32/libclamav.vcxproj.filters
index fe2aaa425..5aa4dd2a8 100644
--- a/win32/libclamav.vcxproj.filters
+++ b/win32/libclamav.vcxproj.filters
@@ -249,9 +249,6 @@
     <ClCompile Include="..\libclamav\prtn_intxn.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="3rdparty\pthreads\pthread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\libclamav\yc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/win32/pthreads.vcxproj b/win32/pthreads.vcxproj
new file mode 100644
index 000000000..01f84f58d
--- /dev/null
+++ b/win32/pthreads.vcxproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include=".\3rdparty\pthreads\pthread.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\3rdparty\pthreads\config.h" />
+    <ClInclude Include=".\3rdparty\pthreads\context.h" />
+    <ClInclude Include=".\3rdparty\pthreads\implement.h" />
+    <ClInclude Include=".\3rdparty\pthreads\need_errno.h" />
+    <ClInclude Include=".\3rdparty\pthreads\pthread.h" />
+    <ClInclude Include=".\3rdparty\pthreads\sched.h" />
+    <ClInclude Include=".\3rdparty\pthreads\semaphore.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{56424F95-3DE6-429D-8D80-7F57CCE9209C}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>pthreads</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir).\3rdparty\pthreads</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir).\3rdparty\pthreads</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir).\3rdparty\pthreads</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;MSPACK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir).\3rdparty\pthreads</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/pthreads.vcxproj.filters b/win32/pthreads.vcxproj.filters
new file mode 100644
index 000000000..bb5ddbb08
--- /dev/null
+++ b/win32/pthreads.vcxproj.filters
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include=".\3rdparty\pthreads\pthread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_getdetachstate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_getinheritsched.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_getschedparam.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_getschedpolicy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_getscope.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_getstackaddr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_getstacksize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_setdetachstate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_setinheritsched.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_setschedparam.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_setschedpolicy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_setscope.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_setstackaddr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_attr_setstacksize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_barrierattr_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_barrierattr_getpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_barrierattr_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_barrierattr_setpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_barrier_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_barrier_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_barrier_wait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_cancel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_condattr_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_condattr_getpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_condattr_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_condattr_setpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_cond_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_cond_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_cond_signal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_cond_wait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_delay_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_detach.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_equal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_exit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_getconcurrency.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_getschedparam.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_getspecific.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_getunique_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_getw32threadhandle_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_join.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_key_create.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_key_delete.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_kill.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_getkind_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_getpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_getrobust.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_gettype.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_setkind_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_setpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_setrobust.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutexattr_settype.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutex_consistent.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutex_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutex_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutex_lock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutex_timedlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutex_trylock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_mutex_unlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_num_processors_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_once.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlockattr_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlockattr_getpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlockattr_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlockattr_setpshared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_rdlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_timedrdlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_timedwrlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_tryrdlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_trywrlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_unlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_rwlock_wrlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_self.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_setcancelstate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_setcanceltype.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_setconcurrency.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_setschedparam.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_setspecific.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_spin_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_spin_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_spin_lock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_spin_trylock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_spin_unlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_testcancel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_timechange_handler_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\pthread_win32_attach_detach_np.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_calloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_callUserDestroyRoutines.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_cond_check_need_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_getprocessors.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_is_attr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_MCS_lock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_mutex_check_need_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_new.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_OLL_lock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_processInitialize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_processTerminate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_relmillisecs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_reuse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_rwlock_cancelwrwait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_rwlock_check_need_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_semwait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_spinlock_check_need_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_threadDestroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_threadStart.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_throw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_timespec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_tkAssocCreate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\ptw32_tkAssocDestroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\rwlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sched.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sched_getscheduler.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sched_get_priority_max.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sched_get_priority_min.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sched_setscheduler.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sched_yield.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\semaphore.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_close.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_destroy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_getvalue.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_open.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_post.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_post_multiple.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_timedwait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_trywait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_unlink.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sem_wait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\signal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\spin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\sync.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\tsd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include=".\3rdparty\pthreads\w32_CancelableWait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\3rdparty\pthreads\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include=".\3rdparty\pthreads\context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include=".\3rdparty\pthreads\implement.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include=".\3rdparty\pthreads\need_errno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include=".\3rdparty\pthreads\pthread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include=".\3rdparty\pthreads\sched.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include=".\3rdparty\pthreads\semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file