diff options
| -rw-r--r-- | autobuild.xml | 62 | ||||
| -rw-r--r-- | indra/cmake/Lualibs.cmake | 13 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 20 |
4 files changed, 55 insertions, 41 deletions
diff --git a/autobuild.xml b/autobuild.xml index d802d4b4a5..09d1458d12 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1658,47 +1658,71 @@ <key>name</key> <string>llphysicsextensions_tpv</string> </map> - <key>lualibs</key> + <key>lua</key> <map> - <key>copyright</key> - <string>Lua by Lua.org, PUC-Rio.</string> - <key>description</key> - <string>LUA libs API</string> - <key>license</key> - <string>lua</string> - <key>license_file</key> - <string>LICENSES/lua.txt</string> - <key>name</key> - <string>lualibs</string> <key>platforms</key> <map> - <key>windows</key> + <key>darwin64</key> <map> <key>archive</key> <map> + <key>creds</key> + <string>github</string> <key>hash</key> - <string>55bd833166d03f1467e2c7f24fa9143e</string> + <string>c753877ff4f88ed6748c62e0a003e2d858143868</string> + <key>hash_algorithm</key> + <string>sha1</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87775/805841/openssl-1.1.1l.563846-windows-563846.tar.bz2</string> + <string>https://api.github.com/repos/secondlife/3p-lua/releases/assets/133586821</string> </map> <key>name</key> - <string>windows</string> + <string>darwin64</string> + </map> + <key>linux64</key> + <map> + <key>archive</key> + <map> + <key>creds</key> + <string>github</string> + <key>hash</key> + <string>0556f8960b715bdeceeccf9c0cdb0ccc675e9922</string> + <key>hash_algorithm</key> + <string>sha1</string> + <key>url</key> + <string>https://api.github.com/repos/secondlife/3p-lua/releases/assets/133586822</string> + </map> + <key>name</key> + <string>linux64</string> </map> <key>windows64</key> <map> <key>archive</key> <map> + <key>creds</key> + <string>github</string> <key>hash</key> - <string>6dc51cd8cad422ab1dcd67cc59af119d</string> + <string>c26a33eab236d0a2cb37faff5aa3e06e8cab8ad9</string> + <key>hash_algorithm</key> + <string>sha1</string> <key>url</key> - <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/118146/1013526/lualibs-5.4.581683-windows64-581683.tar.bz2</string> + <string>https://api.github.com/repos/secondlife/3p-lua/releases/assets/133586823</string> </map> <key>name</key> <string>windows64</string> </map> </map> + <key>license</key> + <string>MIT</string> + <key>license_file</key> + <string>LICENSES/lua.txt</string> + <key>copyright</key> + <string>Copyright (c) 1994–2023 Lua.org, PUC-Rio.</string> <key>version</key> - <string>5.4.581683</string> + <string>5.4.6</string> + <key>name</key> + <string>lua</string> + <key>description</key> + <string>Lua is a powerful, efficient, lightweight, embeddable scripting language developed by a team at PUC-Rio, the Pontifical Catholic University of Rio de Janeiro in Brazil.</string> </map> <key>mesa</key> <map> @@ -3259,4 +3283,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <string>Second Life Viewer</string> </map> </map> -</llsd> +</llsd>
\ No newline at end of file diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake index ec40d0f41c..e7d5875198 100644 --- a/indra/cmake/Lualibs.cmake +++ b/indra/cmake/Lualibs.cmake @@ -8,8 +8,15 @@ add_library( ll::lualibs INTERFACE IMPORTED ) use_system_binary( lualibs ) -use_prebuilt_binary(lualibs) +use_prebuilt_binary(lua) -target_link_libraries(ll::lualibs INTERFACE ${lualibs}) +target_include_directories( ll::lualibs SYSTEM INTERFACE + ${LIBS_PREBUILT_DIR}/include +) -target_include_directories( ll::lualibs SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/lualibs) +if (WINDOWS) + target_link_libraries(ll::lualibs INTERFACE lua54.dll) +elseif (DARWIN) + target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/liblua.a) +elseif (LINUX) +endif (WINDOWS) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 5dd4321330..ef4899978e 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -13,7 +13,6 @@ include(Copy3rdPartyLibs) include(ZLIBNG) include(URIPARSER) include(Tracy) -include(lualibs) set(llcommon_SOURCE_FILES diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 6fc0f28a89..aa723c62cd 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1805,20 +1805,6 @@ if (WINDOWS) if (PACKAGE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2 - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CFG_INTDIR} - DEPENDS - lleventhost - ${EVENT_HOST_SCRIPTS} - ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py - ) - - add_custom_command( OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat COMMAND ${PYTHON_EXECUTABLE} ARGS @@ -1847,9 +1833,6 @@ if (WINDOWS) add_custom_target(llpackage ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat ) - # temporarily disable packaging of event_host until hg subrepos get - # sorted out on the parabuild cluster... - #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2) endif (PACKAGE) elseif (DARWIN) @@ -1917,6 +1900,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLPHYSICSEXTENSIONS_LIBRARIES} ll::bugsplat ll::tracy + ll::lualibs ) if( TARGET ll::intel_memops ) @@ -2287,7 +2271,7 @@ if (LL_TESTS) LL_ADD_INTEGRATION_TEST(llluamanager "llluamanager.cpp" - "${test_libs}" + "${test_libs};ll::lualibs" ) LL_ADD_INTEGRATION_TEST(llsechandler_basic |