mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-29 16:34:30 +00:00
Code Issues Releases Wiki Activity

Require SOL_PROPAGATE_EXCEPTIONS to be off

Browse source
This commit is contained in:
Evil Eye 2025-09-20 16:07:59 +02:00
parent b0cf148393
commit 3ba702690c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -481,6 +481,7 @@ set(SOL_INCLUDE_DIR ${OpenMW_SOURCE_DIR}/extern/sol3)
set(SOL_CONFIG_DIR ${OpenMW_SOURCE_DIR}/extern/sol_config) set(SOL_CONFIG_DIR ${OpenMW_SOURCE_DIR}/extern/sol_config)
include_directories( include_directories(
${SOL_CONFIG_DIR}
"." "."
BEFORE SYSTEM BEFORE SYSTEM
${MyGUI_INCLUDE_DIRS} ${MyGUI_INCLUDE_DIRS}
@ -489,7 +490,6 @@ include_directories(
${BULLET_INCLUDE_DIRS} ${BULLET_INCLUDE_DIRS}
${LUA_INCLUDE_DIR} ${LUA_INCLUDE_DIR}
${SOL_INCLUDE_DIR} ${SOL_INCLUDE_DIR}
${SOL_CONFIG_DIR}
${ICU_INCLUDE_DIRS} ${ICU_INCLUDE_DIRS}
) )

4
components/lua/luastate.cpp
View file

@ -15,6 +15,10 @@
#include "scriptscontainer.hpp" #include "scriptscontainer.hpp"
#include "utf8.hpp" #include "utf8.hpp"
#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
#error SOL_PROPAGATE_EXCEPTIONS inhibits error checking
#endif
namespace LuaUtil namespace LuaUtil
{ {
static VFS::Path::Normalized packageNameToVfsPath(std::string_view packageName, const VFS::Manager& vfs) static VFS::Path::Normalized packageNameToVfsPath(std::string_view packageName, const VFS::Manager& vfs)