diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-11-02 17:46:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-11-02 17:46:04 -0400 |
| commit | f80ede0a752447d81086f672001a562e4492553f (patch) | |
| tree | 855e293937768e8e57dd714562b538fb6261ee0e /indra | |
| parent | bb51ead8815d6f1843bed3f16dfae94aa0e85950 (diff) | |
DRTVWR-589: Update Lualibs.cmake to use lua54.lib from 3p-lua.
Also remove
#pragma comment(lib, "liblua54.a")
from relevant source files.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Lualibs.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterluadebug.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llluamanager.cpp | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake index e7d5875198..b6a7de41c6 100644 --- a/indra/cmake/Lualibs.cmake +++ b/indra/cmake/Lualibs.cmake @@ -15,7 +15,7 @@ target_include_directories( ll::lualibs SYSTEM INTERFACE ) if (WINDOWS) - target_link_libraries(ll::lualibs INTERFACE lua54.dll) + target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/lua54.lib) elseif (DARWIN) target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/liblua.a) elseif (LINUX) diff --git a/indra/newview/llfloaterluadebug.cpp b/indra/newview/llfloaterluadebug.cpp index 44454d7be0..32e9e4f1b7 100644 --- a/indra/newview/llfloaterluadebug.cpp +++ b/indra/newview/llfloaterluadebug.cpp @@ -38,10 +38,6 @@ #include "llluamanager.h" -#if LL_WINDOWS -#pragma comment(lib, "liblua54.a") -#endif - LLFloaterLUADebug::LLFloaterLUADebug(const LLSD &key) : LLFloater(key) diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp index 0475122832..abef3ce368 100644 --- a/indra/newview/llluamanager.cpp +++ b/indra/newview/llluamanager.cpp @@ -80,10 +80,6 @@ extern "C" #include <string_view> #include <vector> -#if LL_WINDOWS -#pragma comment(lib, "liblua54.a") -#endif - std::string lua_tostdstring(lua_State* L, int index); void lua_pushstdstring(lua_State* L, const std::string& str); LLSD lua_tollsd(lua_State* L, int index); |