From 4266b1f83fc8fee6038914460ea5dc609e1d05d5 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 22:27:42 -0700 Subject: [PATCH] fixes and such --- Projects/CMakeLists.txt | 2 ++ Projects/Engine/Source/App/V8/Tree/Instance.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Projects/CMakeLists.txt b/Projects/CMakeLists.txt index 2c0e8f2..05096f1 100644 --- a/Projects/CMakeLists.txt +++ b/Projects/CMakeLists.txt @@ -5,5 +5,7 @@ set(LUAU_BUILD_TESTS OFF CACHE BOOL "" FORCE) add_subdirectory(${DEPENDENCIES_DIR}/Luau ${CMAKE_BINARY_DIR}/Dependencies/Luau) # RNR +add_link_options(-static) + add_subdirectory(Engine) add_subdirectory(Client) \ No newline at end of file diff --git a/Projects/Engine/Source/App/V8/Tree/Instance.cpp b/Projects/Engine/Source/App/V8/Tree/Instance.cpp index 06adae0..3796bdc 100644 --- a/Projects/Engine/Source/App/V8/Tree/Instance.cpp +++ b/Projects/Engine/Source/App/V8/Tree/Instance.cpp @@ -114,12 +114,12 @@ namespace RNR char error_text[255]; if (this == newParent) { - snprintf(error_text, 255, "Attempt to set %s as its own parent", m_name); + snprintf(error_text, 255, "Attempt to set %s as its own parent", m_name.c_str()); throw std::runtime_error(error_text); } if (isAncestorOf(newParent)) { - snprintf(error_text, 255, "Attempt to set parent of %s to %s results in circular reference", newParent->getName(), m_name); + snprintf(error_text, 255, "Attempt to set parent of %s to %s results in circular reference", newParent->getName().c_str(), m_name.c_str()); throw std::runtime_error(error_text); }