From c9bf9a10563a548a27835cafd25d42c9ab93a97d Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 13 Nov 2024 20:11:18 +0800 Subject: Fix FMOD 2.02.25 Linux installation --- indra/newview/ViewerInstall.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 6080dd512e..557cfe7021 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -106,7 +106,7 @@ if (LINUX) install(FILES ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.23 + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.25 DESTINATION ${_LIB}) endif (USE_FMODSTUDIO) endif (LINUX) -- cgit v1.2.3 From e05e5fc1d4b831ceed3fecb7854c69ff61d9adf4 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 20 Nov 2024 15:06:30 +0800 Subject: MacPorts' expat (compatibility) has been updated --- indra/newview/FixBundle.cmake.in | 6 +++--- indra/newview/FixPackage.cmake.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index bf3a36b5d0..63041fb603 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -190,9 +190,9 @@ execute_process( COMMAND lipo libcollada14dom.2.3-r4.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libcollada14dom.2.3-r4.dylib - COMMAND lipo libexpat.1.9.3.dylib + COMMAND lipo libexpat.1.10.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.9.3.dylib + -output libexpat.1.10.0.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib @@ -295,7 +295,7 @@ execute_process( Frameworks/libbrotlidec.1.1.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libcollada14dom.2.3-r4.dylib - Frameworks/libexpat.1.9.3.dylib + Frameworks/libexpat.1.10.0.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib Frameworks/libiconv.2.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 2dec79c59b..5f9ba28fc0 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -190,9 +190,9 @@ execute_process( COMMAND lipo libcollada14dom.2.3-r4.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libcollada14dom.2.3-r4.dylib - COMMAND lipo libexpat.1.9.3.dylib + COMMAND lipo libexpat.1.10.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.9.3.dylib + -output libexpat.1.10.0.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib @@ -295,7 +295,7 @@ execute_process( Frameworks/libbrotlidec.1.1.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libcollada14dom.2.3-r4.dylib - Frameworks/libexpat.1.9.3.dylib + Frameworks/libexpat.1.10.0.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib Frameworks/libiconv.2.dylib -- cgit v1.2.3