diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-11-29 18:38:55 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-11-29 18:38:55 +0800 |
| commit | 780b5c3bd9a2a97790efc1169817f1fc574f3387 (patch) | |
| tree | db8a5cecd487ce4928b1161d0274e8f583e2e68c /indra | |
| parent | 9a5ef53955548119fa747c9dab86461484035fff (diff) | |
| parent | 664e5f5b180a4e132c04a0f164d92671bc43f5ba (diff) | |
Merge branch 'main' into 2025.08
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 14 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 224a981300..abeb7a8a5e 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -149,12 +149,12 @@ execute_process( COMMAND lipo libboost_url-mt.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libboost_url-mt.dylib - COMMAND lipo libbrotlicommon.1.1.0.dylib + COMMAND lipo libbrotlicommon.1.2.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlicommon.1.1.0.dylib - COMMAND lipo libbrotlidec.1.1.0.dylib + -output libbrotlicommon.1.2.0.dylib + COMMAND lipo libbrotlidec.1.2.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlidec.1.1.0.dylib + -output libbrotlidec.1.2.0.dylib COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib @@ -257,8 +257,8 @@ execute_process( Frameworks/libboost_system-mt.dylib Frameworks/libboost_thread-mt.dylib Frameworks/libboost_url-mt.dylib - Frameworks/libbrotlicommon.1.1.0.dylib - Frameworks/libbrotlidec.1.1.0.dylib + Frameworks/libbrotlicommon.1.2.0.dylib + Frameworks/libbrotlidec.1.2.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib Frameworks/libexpat.1.11.1.dylib @@ -638,7 +638,7 @@ execute_process( Resources/SLPlugin.app/Contents/Frameworks/plugins/libyuy2_i420_plugin.dylib Resources/SLPlugin.app/Contents/Frameworks/plugins/libyuy2_i422_plugin.dylib Resources/SLPlugin.app/Contents/Frameworks/plugins/libzvbi_plugin.dylib - Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper\ \(GPU\).app/Contents/MacOS/DullahanHelper\ \(Alerts\) + Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper\ \(Alerts\).app/Contents/MacOS/DullahanHelper\ \(Alerts\) Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper\ \(GPU\).app/Contents/MacOS/DullahanHelper\ \(GPU\) Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper\ \(Plugin\).app/Contents/MacOS/DullahanHelper\ \(Plugin\) WORKING_DIRECTORY ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 6a64bb2c0f..c130bf4784 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -149,12 +149,12 @@ execute_process( COMMAND lipo libboost_url-mt.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libboost_url-mt.dylib - COMMAND lipo libbrotlicommon.1.1.0.dylib + COMMAND lipo libbrotlicommon.1.2.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlicommon.1.1.0.dylib - COMMAND lipo libbrotlidec.1.1.0.dylib + -output libbrotlicommon.1.2.0.dylib + COMMAND lipo libbrotlidec.1.2.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlidec.1.1.0.dylib + -output libbrotlidec.1.2.0.dylib COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib @@ -257,8 +257,8 @@ execute_process( Frameworks/libboost_system-mt.dylib Frameworks/libboost_thread-mt.dylib Frameworks/libboost_url-mt.dylib - Frameworks/libbrotlicommon.1.1.0.dylib - Frameworks/libbrotlidec.1.1.0.dylib + Frameworks/libbrotlicommon.1.2.0.dylib + Frameworks/libbrotlidec.1.2.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib Frameworks/libexpat.1.11.1.dylib |