ouczbs/zengine-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update xmake to md

Browse Source
This commit is contained in:
ouczbs 2024-06-28 00:03:52 +08:00
parent 357f9005ff
commit 26ac7f246a
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/3rdparty/xmake.lua vendored
View File

@ -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")
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}})

2
engine/3rdparty/zlib/include/yaml/serialize/binary.inl vendored
View File

@ -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;
}

4
engine/3rdparty/zlib/include/yaml/yaml.h vendored
View File

@ -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;
}

13
engine/src/engine/vulkanapi/tool/glsl_to_spirv.cpp
View File

@ -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 (...)
{

1
xmake.lua
View File

@ -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"