diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cryptopp/misc.h | 2 | ||||
| -rw-r--r-- | lib/lua/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/cryptopp/misc.h b/lib/cryptopp/misc.h index 2b326dd60..9149b9ac0 100644 --- a/lib/cryptopp/misc.h +++ b/lib/cryptopp/misc.h @@ -545,7 +545,7 @@ inline void SecureWipeArray(T *buf, size_t n) } // this function uses wcstombs(), which assumes that setlocale() has been called -static std::string StringNarrow(const wchar_t *str, bool throwOnError = true) +inline std::string StringNarrow(const wchar_t *str, bool throwOnError = true) { #ifdef _MSC_VER #pragma warning(push) diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt index b4b5b5f1d..af03f4b1a 100644 --- a/lib/lua/CMakeLists.txt +++ b/lib/lua/CMakeLists.txt @@ -25,6 +25,11 @@ else() add_library(lua ${SOURCE}) endif() +# Tell Lua what dynamic loader to use (for LuaRocks): +if (UNIX) + add_definitions(-DLUA_USE_DLOPEN) +endif() + if (UNIX) target_link_libraries(lua m ${DYNAMIC_LOADER}) endif() |