diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-04-03 16:42:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 16:42:36 -0400 |
| commit | e2d15198bd3d81250850ac7061fdbc7c6153647f (patch) | |
| tree | 5b7b05f692c56b083dcfe848ea9a0f5cb59346ff /indra | |
| parent | 276f95e67ee10cbadee899c845c385cadcaa8292 (diff) | |
| parent | 6b8f86885b500555ec4f2bb06db8fc9020b723cd (diff) | |
Merge pull request #1124 from Nicky-D/release/luau-scripting
Luau for Linux
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Lualibs.cmake | 6 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake index 7edfbfdc3d..d66305a8e5 100644 --- a/indra/cmake/Lualibs.cmake +++ b/indra/cmake/Lualibs.cmake @@ -20,10 +20,10 @@ if (WINDOWS) 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) -elseif (DARWIN) - target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.Ast.a) +else () target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.CodeGen.a) target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.Compiler.a) target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.Config.a) target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.VM.a) -endif (WINDOWS) + target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.Ast.a) +endif () diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f41e481b26..5d594d527e 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -48,7 +48,7 @@ include(VulkanGltf) include(ZLIBNG) include(URIPARSER) include(LLPrimitive) -include(lualibs) +include(Lualibs) if (NOT HAVOK_TPV) # When using HAVOK_TPV, the library is precompiled, so no need for this @@ -2381,4 +2381,3 @@ if (LL_TESTS) endif (LL_TESTS) check_message_template(${VIEWER_BINARY_NAME}) - |