ouczbs/idk_me
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuild project exe dir

Browse Source
This commit is contained in:
ouczbs 2024-05-29 16:57:16 +08:00
parent 008dd45e60
commit 3b5ae0c3a1
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -18,3 +18,10 @@ src/engine/idk/phys/PhysicsSystemNoMT.cpp
src/testproj/ src/testproj/
src/engine/editor_data/ src/engine/editor_data/
src/engine/engine_data/ src/engine/engine_data/
src/*.pdb
src/*.dll
src/*.txt
src/*.lib
src/*.exe
src/*.exp
src/*.ilk

2
src/engine/editor/IDE.cpp
View File

@ -123,7 +123,7 @@ namespace idk
auto& fs = Core::GetSystem<FileSystem>(); auto& fs = Core::GetSystem<FileSystem>();
fs.Mount(string{ fs.GetExeDir() } + "/editor_data", "/editor_data", false); fs.Mount(string{ fs.GetExeDir() } + "/engine/editor_data", "/editor_data", false);
if (shadergraph::NodeTemplate::GetTable().empty()) if (shadergraph::NodeTemplate::GetTable().empty())
shadergraph::NodeTemplate::LoadTable("/editor_data/nodes"); shadergraph::NodeTemplate::LoadTable("/editor_data/nodes");

2
src/engine/editor/commands/CMD_ModifyGameObjectHeader.cpp
View File

@ -1,7 +1,7 @@
#include "pch.h" #include "pch.h"
#include "CMD_ModifyGameObjectHeader.h" #include "CMD_ModifyGameObjectHeader.h"
#include <prefab/PrefabUtility.h> #include <prefab/PrefabUtility.h>
#include <ReflectReg_Common.inl>
namespace idk namespace idk
{ {

2
src/engine/idk/script/MonoBehaviorEnvironment.cpp
View File

@ -49,7 +49,7 @@ namespace idk::mono
mono_domain_set(_domain, true); mono_domain_set(_domain, true);
MonoImageOpenStatus status; MonoImageOpenStatus status;
auto img = mono_image_open_from_data(assembly_data.data(), (uint32_t) assembly_data.size(), true, &status); auto img = mono_image_open_from_data(assembly_data.data(), (uint32_t) assembly_data.size(), true, &status);
mono_assembly_setrootdir((string{ Core::GetSystem<FileSystem>().GetExeDir() } +"/engine_data").data()); mono_assembly_setrootdir((string{ Core::GetSystem<FileSystem>().GetExeDir() } +"/engine/engine_data").data());
_assembly = mono_assembly_load_from(img, full_path_to_game_dll.data(), &status); _assembly = mono_assembly_load_from(img, full_path_to_game_dll.data(), &status);
Core::GetSystem<ScriptSystem>().Environment().Image(); Core::GetSystem<ScriptSystem>().Environment().Image();

2
src/xmake.lua
View File

@ -1,5 +1,6 @@
includes("*/xmake.lua") includes("*/xmake.lua")
includes("engine/dep/xmake.lua") includes("engine/dep/xmake.lua")
set_targetdir("$(projectdir)/src")
target("idk") target("idk")
set_kind("static") set_kind("static")
add_deps("idk_dep") add_deps("idk_dep")
@ -46,7 +47,6 @@ target("game")
target("launcher") target("launcher")
set_kind("binary") set_kind("binary")
set_runargs("--project:$(projectdir)\\src\\testproj\\testproj.idk", "--engine:$(projectdir)\\src\\engine")
add_deps("editor", "win32") add_deps("editor", "win32")
add_syslinks("Xinput") add_syslinks("Xinput")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]]) add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])