From 26ac7f246a8a44fb37fb978e3826cdb8c1ec34ea Mon Sep 17 00:00:00 2001
From: ouczbs <ouczbs@qq.com>
Date: Fri, 28 Jun 2024 00:03:52 +0800
Subject: [PATCH] update xmake to md

---
 engine/3rdparty/xmake.lua                           |  8 ++++++--
 .../3rdparty/zlib/include/yaml/serialize/binary.inl |  2 +-
 engine/3rdparty/zlib/include/yaml/yaml.h            |  4 ++--
 engine/src/engine/vulkanapi/tool/glsl_to_spirv.cpp  | 13 -------------
 xmake.lua                                           |  1 +
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/engine/3rdparty/xmake.lua b/engine/3rdparty/xmake.lua
index 1c37b84..128f5ad 100644
--- a/engine/3rdparty/xmake.lua
+++ b/engine/3rdparty/xmake.lua
@@ -1,6 +1,10 @@
 includes("**/xmake.lua")
 add_requires("spdlog")
-add_requires("tinyobjloader")
+add_requires("tinyobjloader", {system = false, configs = {runtimes = "MD"}})
 add_requires("assimp","nlohmann_json")
 add_requires("benchmark")
-add_requires("vulkansdk", "glslang","spirv-cross", "spirv-tools", "shaderc")
\ No newline at end of file
+local utils = {
+    "glslang", "SPIRV", "SPIRV-Tools", "shaderc", "shaderc_shared","shaderc_util", "shaderc_combined",
+    "spirv-cross-glsl","spirv-cross-cpp", "spirv-cross-core", "spirv-cross-reflect","spirv-cross-util"
+}
+add_requires("vulkansdk",{configs = {utils = utils}})
\ No newline at end of file
diff --git a/engine/3rdparty/zlib/include/yaml/serialize/binary.inl b/engine/3rdparty/zlib/include/yaml/serialize/binary.inl
index 91e2d41..1e13803 100644
--- a/engine/3rdparty/zlib/include/yaml/serialize/binary.inl
+++ b/engine/3rdparty/zlib/include/yaml/serialize/binary.inl
@@ -2,7 +2,7 @@
 #include "binary.h"
 namespace YAML
 {
-	bool BinaryArchive::serialize(const refl::Any& any)
+	inline bool BinaryArchive::serialize(const refl::Any& any)
 	{
 		return false;
 	}
diff --git a/engine/3rdparty/zlib/include/yaml/yaml.h b/engine/3rdparty/zlib/include/yaml/yaml.h
index 149b783..de1a8df 100644
--- a/engine/3rdparty/zlib/include/yaml/yaml.h
+++ b/engine/3rdparty/zlib/include/yaml/yaml.h
@@ -10,11 +10,11 @@ namespace YAML
 		TEXT_EMPTY,
 		TYPE_ERROR,
 	};
-	string Text_Serialize(const Any& any) {
+	inline string Text_Serialize(const Any& any) {
 		return Dump(TextArchive::Serialize(any));
 	}
 	template<typename T>
-	result<T, SerializeError> Text_Unserialize(const string& text) {
+	inline result<T, SerializeError> Text_Unserialize(const string& text) {
 		if (text.empty()) {
 			return SerializeError::TEXT_EMPTY;
 		}
diff --git a/engine/src/engine/vulkanapi/tool/glsl_to_spirv.cpp b/engine/src/engine/vulkanapi/tool/glsl_to_spirv.cpp
index 807b87c..475eb0c 100644
--- a/engine/src/engine/vulkanapi/tool/glsl_to_spirv.cpp
+++ b/engine/src/engine/vulkanapi/tool/glsl_to_spirv.cpp
@@ -63,19 +63,6 @@ namespace vulkanapi
 				//LOG_TO(LogPool::GFX, "%s", err_msg);
 				try
 				{
-					/*
-					auto path = string{ Core::GetSystem<FileSystem>().GetAppDataDir() } +"/idk";
-					if (!std::filesystem::exists(path.sv()))
-						std::filesystem::create_directory(path.sv());
-					path += "/shader_err";
-					if (!std::filesystem::exists(path.sv()))
-						std::filesystem::create_directory(path.sv());
-					auto out_file = path + filename;
-					std::ofstream out{ out_file };
-					out << val;
-					out << " /* Error Message: \n" << err_msg << "\n*///";
-					/*out.close();
-					*/
 				}
 				catch (...)
 				{
diff --git a/xmake.lua b/xmake.lua
index 5a66e33..c2d2c05 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -4,6 +4,7 @@ set_arch("x64")
 set_languages("cxx20")
 set_project("zengine")
 set_toolchains("clang")
+set_runtimes("MD","c++_shared")
 includes("engine")
 --xmake project -k vsxmake2022 -a x64
 --xmake project -k vsxmake2022 -m "debug;release"
\ No newline at end of file