move cpr in-tree (#605)

* added cpr 1.10.5 in-tree to allow updates to vcpkg without breaking the build
* added asio 1.29.0 in-tree to remove one more vcpkg dependency
* bumped vcpkg to 2024.06.15 to address failure to build due to use of deprecated binaries in vcpkg (404 error: `https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pkgconf-1~2.1.0-1-any.pkg.tar.zst` during build)

7 files changed, 14 insertions, 10 deletions

diff --git a/src/zen/xmake.lua b/src/zen/xmake.lua
index f36573d62..f225984c9 100644
--- a/src/zen/xmake.lua
+++ b/src/zen/xmake.lua
@@ -28,4 +28,4 @@ target("zen")
         add_ldflags("-framework SystemConfiguration")
     end
 
-    add_packages("vcpkg::cpr", "vcpkg::cxxopts", "vcpkg::mimalloc", "vcpkg::fmt")
+    add_packages("vcpkg::cxxopts", "vcpkg::mimalloc", "vcpkg::fmt")
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index 19152cc97..24011d300 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -52,6 +52,12 @@ target('zencore')
     if has_config("zensentry") then
         add_packages("vcpkg::sentry-native")
 
+        if is_os("windows") then
+            add_cxxflags("/wd4996")
+        else
+            add_cxxflags("-Wno-deprecated-declarations")    -- temporary workaround for sentry-native deprecation warnings
+        end
+
         if is_plat("windows") then
             add_links("dbghelp", "winhttp", "version")    -- for Sentry
         end
diff --git a/src/zenhttp/xmake.lua b/src/zenhttp/xmake.lua
index af4064012..7b49bace1 100644
--- a/src/zenhttp/xmake.lua
+++ b/src/zenhttp/xmake.lua
@@ -7,10 +7,8 @@ target('zenhttp')
     add_files("**.cpp")
     add_files("servers/httpsys.cpp", {unity_ignored=true})
     add_includedirs("include", {public=true})
-    add_deps("zencore", "zentelemetry", "transport-sdk")
+    add_deps("zencore", "zentelemetry", "transport-sdk", "asio", "cpr")
     add_packages(
-        "vcpkg::asio",
-        "vcpkg::cpr",
         "vcpkg::curl",  -- required by cpr
         "vcpkg::openssl", -- required by curl
         "vcpkg::zlib",  -- required by curl
diff --git a/src/zennet/xmake.lua b/src/zennet/xmake.lua
index a9f67e7e2..b44878acc 100644
--- a/src/zennet/xmake.lua
+++ b/src/zennet/xmake.lua
@@ -6,8 +6,7 @@ target('zennet')
     add_headerfiles("**.h")
     add_files("**.cpp")
     add_includedirs("include", {public=true})
-    add_deps("zencore", "zenutil")
+    add_deps("zencore", "zenutil", "asio")
     add_packages(
-        "vcpkg::gsl-lite",
-        "vcpkg::asio"
+        "vcpkg::gsl-lite"
     )
diff --git a/src/zenserver-test/xmake.lua b/src/zenserver-test/xmake.lua
index 7832e1f72..8a5107199 100644
--- a/src/zenserver-test/xmake.lua
+++ b/src/zenserver-test/xmake.lua
@@ -8,7 +8,7 @@ target("zenserver-test")
     add_files("zenserver-test.cpp", {unity_ignored  = true })
     add_deps("zencore", "zenremotestore", "zenhttp")
     add_deps("zenserver", {inherit=false})
-    add_packages("vcpkg::cpr", "vcpkg::http-parser", "vcpkg::mimalloc")
+    add_packages("vcpkg::http-parser", "vcpkg::mimalloc")
 
     if is_plat("macosx") then
         add_ldflags("-framework CoreFoundation")
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua
index 483bfd5aa..53d50313c 100644
--- a/src/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
@@ -18,7 +18,7 @@ target("zenserver")
     add_includedirs(".")
     set_symbols("debug")
 
-    add_deps("protozero")
+    add_deps("protozero", "asio")
 
     if is_mode("release") then
         set_optimize("fastest")
@@ -49,7 +49,6 @@ target("zenserver")
     add_options("exec")
     
     add_packages(
-        "vcpkg::asio",
         "vcpkg::cxxopts",
         "vcpkg::http-parser",
         "vcpkg::json11",
diff --git a/src/zenutil/commandlineoptions.cpp b/src/zenutil/commandlineoptions.cpp
index 5db6d8c04..81699361b 100644
--- a/src/zenutil/commandlineoptions.cpp
+++ b/src/zenutil/commandlineoptions.cpp
@@ -7,11 +7,13 @@
 #	include <zencore/testing.h>
 #endif	// ZEN_WITH_TESTS
 
+#ifndef CXXOPTS_HAS_FILESYSTEM
 void
 cxxopts::values::parse_value(const std::string& text, std::filesystem::path& value)
 {
 	value = zen::StringToPath(text);
 }
+#endif
 
 namespace zen {