From 81e1963f57d3a8a189cc78beb9c6acee1b0e129b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 26 Jan 2024 16:49:19 +0200
Subject: DRTVWR-589: update to start using Luau libs

---
 indra/cmake/Copy3rdPartyLibs.cmake |  1 -
 indra/cmake/Lualibs.cmake          | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index c2f4949bb7..7938d4f54b 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -60,7 +60,6 @@ if(WINDOWS)
         nghttp2.dll
         libhunspell.dll
         uriparser.dll
-        lua54.dll
         )
 
     # OpenSSL
diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake
index b6a7de41c6..2832cc1fc9 100644
--- a/indra/cmake/Lualibs.cmake
+++ b/indra/cmake/Lualibs.cmake
@@ -8,15 +8,16 @@ add_library( ll::lualibs INTERFACE IMPORTED )
 
 use_system_binary( lualibs )
 
-use_prebuilt_binary(lua)
+use_prebuilt_binary(luau)
 
 target_include_directories( ll::lualibs SYSTEM INTERFACE
                             ${LIBS_PREBUILT_DIR}/include
 )
 
 if (WINDOWS)
-  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)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.Ast.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.CodeGen.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.Compiler.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.Config.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.VM.lib)
 endif (WINDOWS)
-- 
cgit v1.2.3