Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/2.0 changes #855

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/scripting/Scripting.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <reverse/ResourceAsyncReference.h>
#include <reverse/NativeProxy.h>
#include <reverse/RTTILocator.h>
#include <reverse/RTTIExtender.h>
#include <reverse/Converter.h>
#include <reverse/TweakDB/TweakDB.h>
#include <sol_imgui/sol_imgui.h>
Expand Down Expand Up @@ -479,7 +478,7 @@ void Scripting::PostInitializeScripting()
globals["Game"] = this;

RTTIHelper::Initialize(m_lua.AsRef(), m_sandbox);
RTTIExtender::InitializeTypes();
//RTTIExtender::InitializeTypes();

m_mapper.Register();

Expand Down Expand Up @@ -516,7 +515,7 @@ void Scripting::PostInitializeMods()
auto lua = m_lua.Lock();
auto& luaVm = lua.Get();

RTTIExtender::InitializeSingletons();
//RTTIExtender::InitializeSingletons();

RegisterOverrides();

Expand Down
Binary file modified vendor/asiloader/version.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ end

set_runtimes(vsRuntime);

add_requireconfs("*", { configs = { debug = is_mode("debug"), lto = not is_mode("debug"), shared = false, vs_runtime = vsRuntime } })
add_requireconfs("**", { configs = { debug = is_mode("debug"), lto = not is_mode("debug"), shared = false, vs_runtime = vsRuntime } })

add_requires("spdlog 1.11.0")
add_requires("nlohmann_json")
Expand Down
Loading