diff --git a/.gitignore b/.gitignore index 197e128..52c4f48 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,10 @@ src/engine/idk/phys/PhysicsSystemNoMT.cpp src/testproj/ src/engine/editor_data/ src/engine/engine_data/ +src/*.pdb +src/*.dll +src/*.txt +src/*.lib +src/*.exe +src/*.exp +src/*.ilk diff --git a/src/engine/editor/IDE.cpp b/src/engine/editor/IDE.cpp index 157f59a..0b3cb21 100644 --- a/src/engine/editor/IDE.cpp +++ b/src/engine/editor/IDE.cpp @@ -123,7 +123,7 @@ namespace idk auto& fs = Core::GetSystem(); - 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()) shadergraph::NodeTemplate::LoadTable("/editor_data/nodes"); diff --git a/src/engine/editor/commands/CMD_ModifyGameObjectHeader.cpp b/src/engine/editor/commands/CMD_ModifyGameObjectHeader.cpp index ffe97d4..d9b39af 100644 --- a/src/engine/editor/commands/CMD_ModifyGameObjectHeader.cpp +++ b/src/engine/editor/commands/CMD_ModifyGameObjectHeader.cpp @@ -1,7 +1,7 @@ #include "pch.h" #include "CMD_ModifyGameObjectHeader.h" #include - +#include namespace idk { diff --git a/src/engine/idk/script/MonoBehaviorEnvironment.cpp b/src/engine/idk/script/MonoBehaviorEnvironment.cpp index d33f9bd..e064893 100644 --- a/src/engine/idk/script/MonoBehaviorEnvironment.cpp +++ b/src/engine/idk/script/MonoBehaviorEnvironment.cpp @@ -49,7 +49,7 @@ namespace idk::mono mono_domain_set(_domain, true); MonoImageOpenStatus status; auto img = mono_image_open_from_data(assembly_data.data(), (uint32_t) assembly_data.size(), true, &status); - mono_assembly_setrootdir((string{ Core::GetSystem().GetExeDir() } +"/engine_data").data()); + mono_assembly_setrootdir((string{ Core::GetSystem().GetExeDir() } +"/engine/engine_data").data()); _assembly = mono_assembly_load_from(img, full_path_to_game_dll.data(), &status); Core::GetSystem().Environment().Image(); diff --git a/src/xmake.lua b/src/xmake.lua index ff0553d..dfcf55b 100644 --- a/src/xmake.lua +++ b/src/xmake.lua @@ -1,5 +1,6 @@ includes("*/xmake.lua") includes("engine/dep/xmake.lua") +set_targetdir("$(projectdir)/src") target("idk") set_kind("static") add_deps("idk_dep") @@ -46,7 +47,6 @@ target("game") target("launcher") set_kind("binary") - set_runargs("--project:$(projectdir)\\src\\testproj\\testproj.idk", "--engine:$(projectdir)\\src\\engine") add_deps("editor", "win32") add_syslinks("Xinput") add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])