diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-04-23 09:05:57 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-04-23 09:05:57 +0800 |
| commit | 61bcfe199966a7253cdabfc721aa2330fd3dacce (patch) | |
| tree | 3f1a171a0cc08e3372a6c7cb0dd0097293ea33a6 /indra | |
| parent | 4c61b111b7b47e7ce2520f8bb362b90547eb85d6 (diff) | |
| parent | db4cd24ad6eff20200289c31ea2bafd7f1c0f603 (diff) | |
Merge branch 'main' into 2026.02
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 6 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 49ef0d3d11..ac5e3cbe3e 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -200,9 +200,9 @@ execute_process( COMMAND lipo libogg.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libogg.0.dylib - COMMAND lipo libopenal.1.24.2.dylib + COMMAND lipo libopenal.1.25.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.24.2.dylib + -output libopenal.1.25.1.dylib COMMAND lipo libopenjp2.2.5.4.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libopenjp2.2.5.4.dylib @@ -272,7 +272,7 @@ execute_process( Frameworks/libndofdev.dylib Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib - Frameworks/libopenal.1.24.2.dylib + Frameworks/libopenal.1.25.1.dylib Frameworks/libopenjp2.2.5.4.dylib Frameworks/libpng16.16.dylib Frameworks/libvlc.5.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 0be6a90968..a0eea41292 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -200,9 +200,9 @@ execute_process( COMMAND lipo libogg.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libogg.0.dylib - COMMAND lipo libopenal.1.24.2.dylib + COMMAND lipo libopenal.1.25.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.24.2.dylib + -output libopenal.1.25.1.dylib COMMAND lipo libopenjp2.2.5.4.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libopenjp2.2.5.4.dylib @@ -272,7 +272,7 @@ execute_process( Frameworks/libndofdev.dylib Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib - Frameworks/libopenal.1.24.2.dylib + Frameworks/libopenal.1.25.1.dylib Frameworks/libopenjp2.2.5.4.dylib Frameworks/libpng16.16.dylib Frameworks/libvlc.5.dylib |