Missing files & fix boost_url linking

fynv · Dec 21, 2023 · 5e94d73 · 5e94d73
1 parent 2f61810
commit 5e94d73
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 1 deletion.
diff --git a/QGameDev/CMakeLists.txt b/QGameDev/CMakeLists.txt
@@ -174,6 +174,7 @@ set (LINK_DIR
 ../thirdparty/portaudio/lib
 ../thirdparty/webp/lib
 ../thirdparty/webview2/lib
+../packages/boost_url-vc143.1.84.0/lib/native
 ../packages/zeroc.openssl.v143.1.1.1.3/build/native/lib/x64/Release
 ../packages/FFmpeg.Nightly.20200831.1.0/build/native/lib/x64
 ../packages/v8-v143-x64.11.9.169.4/lib/Release

diff --git a/QGamePlayer/CMakeLists.txt b/QGamePlayer/CMakeLists.txt
@@ -57,6 +57,7 @@ set (LINK_DIR
 ../thirdparty/portaudio/lib
 ../thirdparty/webp/lib
 ../thirdparty/webview2/lib
+../packages/boost_url-vc143.1.84.0/lib/native
 ../packages/zeroc.openssl.v143.1.1.1.3/build/native/lib/x64/Release
 ../packages/FFmpeg.Nightly.20200831.1.0/build/native/lib/x64
 ../packages/v8-v143-x64.11.9.169.4/lib/Release

diff --git a/Test.Cpp/Test.Cpp.vcxproj b/Test.Cpp/Test.Cpp.vcxproj
@@ -162,11 +162,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\boost.1.84.0\build\boost.targets" Condition="Exists('..\packages\boost.1.84.0\build\boost.targets')" />
+    <Import Project="..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets" Condition="Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\boost.1.84.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.84.0\build\boost.targets'))" />
+    <Error Condition="!Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets'))" />
   </Target>
 </Project>
diff --git a/Test.Cpp/packages.config b/Test.Cpp/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.84.0" targetFramework="native" />
+  <package id="boost_url-vc143" version="1.84.0" targetFramework="native" />
 </packages>
diff --git a/Test.V8/Test.V8.vcxproj b/Test.V8/Test.V8.vcxproj
@@ -154,6 +154,7 @@
     <Import Project="..\packages\boost.1.84.0\build\boost.targets" Condition="Exists('..\packages\boost.1.84.0\build\boost.targets')" />
     <Import Project="..\packages\FFmpeg.Nightly.20200831.1.0\build\native\FFmpeg.Nightly.targets" Condition="Exists('..\packages\FFmpeg.Nightly.20200831.1.0\build\native\FFmpeg.Nightly.targets')" />
     <Import Project="..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets" Condition="Exists('..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" />
+    <Import Project="..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets" Condition="Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -164,5 +165,6 @@
     <Error Condition="!Exists('..\packages\v8.redist-v143-x64.11.9.169.4\build\native\v8.redist-v143-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v143-x64.11.9.169.4\build\native\v8.redist-v143-x64.props'))" />
     <Error Condition="!Exists('..\packages\v8-v143-x64.11.9.169.4\build\native\v8-v143-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v143-x64.11.9.169.4\build\native\v8-v143-x64.props'))" />
     <Error Condition="!Exists('..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets'))" />
+    <Error Condition="!Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets'))" />
   </Target>
 </Project>
diff --git a/Test.V8/packages.config b/Test.V8/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.84.0" targetFramework="native" />
+  <package id="boost_url-vc143" version="1.84.0" targetFramework="native" />
   <package id="FFmpeg.Nightly" version="20200831.1.0" targetFramework="native" />
   <package id="v8.redist-v143-x64" version="11.9.169.4" targetFramework="native" />
   <package id="v8-v143-x64" version="11.9.169.4" targetFramework="native" />

diff --git a/Three.V8/Three.V8.vcxproj b/Three.V8/Three.V8.vcxproj
@@ -297,6 +297,7 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\boost.1.84.0\build\boost.targets" Condition="Exists('..\packages\boost.1.84.0\build\boost.targets')" />
     <Import Project="..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets" Condition="Exists('..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" />
+    <Import Project="..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets" Condition="Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -306,5 +307,6 @@
     <Error Condition="!Exists('..\packages\v8.redist-v143-x64.11.9.169.4\build\native\v8.redist-v143-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v143-x64.11.9.169.4\build\native\v8.redist-v143-x64.props'))" />
     <Error Condition="!Exists('..\packages\v8-v143-x64.11.9.169.4\build\native\v8-v143-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v143-x64.11.9.169.4\build\native\v8-v143-x64.props'))" />
     <Error Condition="!Exists('..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets'))" />
+    <Error Condition="!Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets'))" />
   </Target>
 </Project>
diff --git a/Three.V8/packages.config b/Three.V8/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.84.0" targetFramework="native" />
+  <package id="boost_url-vc143" version="1.84.0" targetFramework="native" />
   <package id="v8.redist-v143-x64" version="11.9.169.4" targetFramework="native" />
   <package id="v8-v143-x64" version="11.9.169.4" targetFramework="native" />
   <package id="zeroc.openssl.v143" version="1.1.1.3" targetFramework="native" />

diff --git a/ThreeEngine/ThreeEngine.vcxproj b/ThreeEngine/ThreeEngine.vcxproj
@@ -434,12 +434,14 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\boost.1.84.0\build\boost.targets" Condition="Exists('..\packages\boost.1.84.0\build\boost.targets')" />
     <Import Project="..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets" Condition="Exists('..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" />
+    <Import Project="..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets" Condition="Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\boost.1.84.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.84.0\build\boost.targets'))" />
     <Error Condition="!Exists('..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets'))" />
+    <Error Condition="!Exists('..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_url-vc143.1.84.0\build\boost_url-vc143.targets'))" />
   </Target>
 </Project>
diff --git a/ThreeEngine/network/HttpClient.cpp b/ThreeEngine/network/HttpClient.cpp
@@ -1,4 +1,4 @@
-#include <boost/url/src.hpp>
+#include <boost/url.hpp>
 using namespace boost::urls;
 
 #include "utils/AsyncCallbacks.h"

diff --git a/ThreeEngine/packages.config b/ThreeEngine/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.84.0" targetFramework="native" />
+  <package id="boost_url-vc143" version="1.84.0" targetFramework="native" />
   <package id="zeroc.openssl.v143" version="1.1.1.3" targetFramework="native" />
 </packages>
diff --git a/ThreeEngine/utils/Logging.cpp b/ThreeEngine/utils/Logging.cpp
@@ -0,0 +1,39 @@
+#include <cstdio>
+#include "Logging.h"
+
+void* Logging::m_print_callback_data = nullptr;
+PrintCallback Logging::m_print_callback = nullptr;
+PrintCallback Logging::m_error_callback = nullptr;
+
+void Logging::SetPrintCallbacks(void* ptr, PrintCallback print_callback, PrintCallback error_callback)
+{
+	m_print_callback_data = ptr;
+	m_print_callback = print_callback;
+	m_error_callback = error_callback;
+}
+
+void Logging::print_std(const char* str)
+{
+	if (m_print_callback != nullptr)
+	{
+		m_print_callback(m_print_callback_data, str);
+	}
+	else
+	{
+		printf("%s\n", str);
+	}
+}
+
+void Logging::print_err(const char* str)
+{
+	if (m_error_callback != nullptr)
+	{
+		m_error_callback(m_print_callback_data, str);
+	}
+	else
+	{
+		fprintf(stderr, "%s\n", str);
+	}
+}
+
+
diff --git a/ThreeEngine/utils/Logging.h b/ThreeEngine/utils/Logging.h
@@ -0,0 +1,18 @@
+#pragma once
+
+typedef void (*PrintCallback)(void* ptr, const char* str);
+
+class Logging
+{
+public:
+	static void SetPrintCallbacks(void* ptr, PrintCallback print_callback, PrintCallback error_callback);
+	static void print_std(const char* str);
+	static void print_err(const char* str);
+
+private:
+	static void* m_print_callback_data;
+	static PrintCallback m_print_callback;
+	static PrintCallback m_error_callback;
+
+
+};