Dodany zlib jako submoduł. Kompilacja w Visualu działa

algbio · Mar 10, 2023 · 34a1ace · 34a1ace
1 parent bc0a25a
commit 34a1ace
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 17 deletions.
diff --git a/kmc.sln b/kmc.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31205.134
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kmc_core", "kmc_core\kmc_core.vcxproj", "{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}"
 EndProject
@@ -15,14 +15,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py_kmc_api", "py_kmc_api\py
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kmc_CLI", "kmc_CLI\kmc_CLI.vcxproj", "{043DA599-2052-4FD8-B166-A5E24A9BF8BA}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rd_party\cloudflare\build\zlib.vcxproj", "{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		MinSizeRel|Mixed Platforms = MinSizeRel|Mixed Platforms
+		MinSizeRel|Win32 = MinSizeRel|Win32
+		MinSizeRel|x64 = MinSizeRel|x64
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		RelWithDebInfo|Mixed Platforms = RelWithDebInfo|Mixed Platforms
+		RelWithDebInfo|Win32 = RelWithDebInfo|Win32
+		RelWithDebInfo|x64 = RelWithDebInfo|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
@@ -31,76 +39,172 @@ Global
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Debug|Win32.Build.0 = Debug|Win32
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Debug|x64.ActiveCfg = Debug|x64
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Debug|x64.Build.0 = Debug|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.MinSizeRel|Mixed Platforms.Build.0 = Release|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.MinSizeRel|Win32.Build.0 = Release|Win32
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.MinSizeRel|x64.Build.0 = Release|x64
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Release|Mixed Platforms.Build.0 = Release|x64
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Release|Win32.ActiveCfg = Release|Win32
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Release|Win32.Build.0 = Release|Win32
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Release|x64.ActiveCfg = Release|x64
 		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.Release|x64.Build.0 = Release|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{8C8B90DA-28B7-4D82-81F3-C0E7CE52D59F}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Debug|Win32.Build.0 = Debug|Win32
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Debug|x64.ActiveCfg = Debug|x64
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Debug|x64.Build.0 = Debug|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.MinSizeRel|Mixed Platforms.Build.0 = Release|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.MinSizeRel|Win32.Build.0 = Release|Win32
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.MinSizeRel|x64.Build.0 = Release|x64
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Release|Mixed Platforms.Build.0 = Release|x64
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Release|Win32.ActiveCfg = Release|Win32
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Release|Win32.Build.0 = Release|Win32
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Release|x64.ActiveCfg = Release|x64
 		{8939AD12-23D5-469C-806B-DC3F98F8A514}.Release|x64.Build.0 = Release|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{8939AD12-23D5-469C-806B-DC3F98F8A514}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Debug|Win32.Build.0 = Debug|Win32
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Debug|x64.ActiveCfg = Debug|x64
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Debug|x64.Build.0 = Debug|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.MinSizeRel|Mixed Platforms.Build.0 = Release|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.MinSizeRel|Win32.Build.0 = Release|Win32
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.MinSizeRel|x64.Build.0 = Release|x64
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Release|Mixed Platforms.Build.0 = Release|x64
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Release|Win32.ActiveCfg = Release|Win32
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Release|Win32.Build.0 = Release|Win32
 		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.Release|x64.ActiveCfg = Release|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{17823F37-86DE-4E58-B354-B84DA9EDA6A1}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Debug|Win32.Build.0 = Debug|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Debug|x64.ActiveCfg = Debug|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.MinSizeRel|Mixed Platforms.Build.0 = Release|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.MinSizeRel|Win32.Build.0 = Release|Win32
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.MinSizeRel|x64.Build.0 = Release|x64
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Release|Win32.ActiveCfg = Release|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Release|Win32.Build.0 = Release|Win32
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Release|x64.ActiveCfg = Release|x64
 		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.Release|x64.Build.0 = Release|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{F3B0CC94-9DD0-4642-891C-EA08BDA50260}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Debug|Win32.Build.0 = Debug|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Debug|x64.ActiveCfg = Debug|x64
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Debug|x64.Build.0 = Debug|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.MinSizeRel|Mixed Platforms.Build.0 = Release|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.MinSizeRel|Win32.Build.0 = Release|Win32
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.MinSizeRel|x64.Build.0 = Release|x64
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Release|Win32.ActiveCfg = Release|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Release|Win32.Build.0 = Release|Win32
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Release|x64.ActiveCfg = Release|x64
 		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.Release|x64.Build.0 = Release|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{785C60CA-BFEA-4208-BA3B-3D8E2A79FD9C}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Debug|Win32.Build.0 = Debug|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Debug|x64.ActiveCfg = Debug|x64
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Debug|x64.Build.0 = Debug|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.MinSizeRel|Mixed Platforms.Build.0 = Release|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.MinSizeRel|Win32.Build.0 = Release|Win32
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.MinSizeRel|x64.Build.0 = Release|x64
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Release|Win32.ActiveCfg = Release|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Release|Win32.Build.0 = Release|Win32
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Release|x64.ActiveCfg = Release|x64
 		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.Release|x64.Build.0 = Release|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{043DA599-2052-4FD8-B166-A5E24A9BF8BA}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Debug|Win32.ActiveCfg = Debug|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Debug|Win32.Build.0 = Debug|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Debug|x64.ActiveCfg = Debug|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Debug|x64.Build.0 = Debug|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.MinSizeRel|Mixed Platforms.ActiveCfg = MinSizeRel|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.MinSizeRel|Mixed Platforms.Build.0 = MinSizeRel|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.MinSizeRel|Win32.Build.0 = MinSizeRel|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Release|Mixed Platforms.Build.0 = Release|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Release|Win32.ActiveCfg = Release|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Release|Win32.Build.0 = Release|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Release|x64.ActiveCfg = Release|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.Release|x64.Build.0 = Release|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.RelWithDebInfo|Mixed Platforms.ActiveCfg = RelWithDebInfo|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.RelWithDebInfo|Mixed Platforms.Build.0 = RelWithDebInfo|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{AE29051E-E1D8-3F22-9CA9-64EDD3E02BA3}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BC3A0CEE-782E-46DC-A9C0-330A04586DCF}
 		VisualSVNWorkingCopyRoot = .
+		SolutionGuid = {BC3A0CEE-782E-46DC-A9C0-330A04586DCF}
 	EndGlobalSection
 EndGlobal
diff --git a/kmc_core/fastq_reader.h b/kmc_core/fastq_reader.h
@@ -15,7 +15,7 @@
 #include "params.h"
 #include <stdio.h>
 
-#include "zlib.h"
+#include "../3rd_party/cloudflare/zlib.h"
 
 using namespace std;
 

diff --git a/kmc_core/kmc_core.vcxproj b/kmc_core/kmc_core.vcxproj
@@ -163,6 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\3rd_party\cloudflare\zlib.h" />
     <ClInclude Include="..\kmc_api\mmer.h" />
     <ClInclude Include="bam_utils.h" />
     <ClInclude Include="binary_reader.h" />
@@ -191,8 +192,6 @@
     <ClInclude Include="kxmer_set.h" />
     <ClInclude Include="libs\bzlib.h" />
     <ClInclude Include="libs\bzlib_private.h" />
-    <ClInclude Include="libs\zconf.h" />
-    <ClInclude Include="libs\zlib.h" />
     <ClInclude Include="mem_disk_file.h" />
     <ClInclude Include="meta_oper.h" />
     <ClInclude Include="percent_progress.h" />
@@ -264,7 +263,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Library Include="libs\zlibstat.lib" />
+    <ProjectReference Include="..\3rd_party\cloudflare\build\zlib.vcxproj">
+      <Project>{ae29051e-e1d8-3f22-9ca9-64edd3e02ba3}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/kmc_core/kmc_core.vcxproj.filters b/kmc_core/kmc_core.vcxproj.filters
@@ -65,8 +65,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="libs\zconf.h" />
-    <ClInclude Include="libs\zlib.h" />
     <ClInclude Include="bam_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -202,9 +200,7 @@
     <ClInclude Include="thread_cancellation_exception.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="libs\zlibstat.lib" />
+    <ClInclude Include="..\3rd_party\cloudflare\zlib.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">

diff --git a/kmc_tools/fastq_reader.h b/kmc_tools/fastq_reader.h
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <iostream>
 
-#include "zlib.h"
+#include "../3rd_party/cloudflare/zlib.h"
 
 using namespace std;
 

diff --git a/kmc_tools/kmc_tools.vcxproj b/kmc_tools/kmc_tools.vcxproj
@@ -149,6 +149,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\3rd_party\cloudflare\zlib.h" />
     <ClInclude Include="..\kmc_api\kmc_file.h" />
     <ClInclude Include="..\kmc_api\kmer_api.h" />
     <ClInclude Include="..\kmc_api\mmer.h" />
@@ -211,7 +212,9 @@
     <ClCompile Include="tokenizer.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Library Include="libs\zlibstat.lib" />
+    <ProjectReference Include="..\3rd_party\cloudflare\build\zlib.vcxproj">
+      <Project>{ae29051e-e1d8-3f22-9ca9-64edd3e02ba3}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/kmc_tools/kmc_tools.vcxproj.filters b/kmc_tools/kmc_tools.vcxproj.filters
@@ -141,6 +141,9 @@
     <ClInclude Include="kff_kmc2_reader_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\3rd_party\cloudflare\zlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="kmc_tools.cpp">
@@ -192,7 +195,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="libs\zlibstat.lib" />
-  </ItemGroup>
 </Project>