diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-20 15:06:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-20 15:06:54 +0800 |
| commit | 30842e230e2b3d365e8415f0350f8d10ce8b0637 (patch) | |
| tree | 8c7c50222c856d086a41fea5a8cc6f5bd4fd46fc /indra/newview | |
| parent | 9e282949a79fe56b12a4fdfa8fa4552338d8a370 (diff) | |
| parent | e05e5fc1d4b831ceed3fecb7854c69ff61d9adf4 (diff) | |
Merge branch 'main' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview')
| -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 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 |