diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-17 14:57:43 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-17 16:04:00 +0800 |
| commit | 3a36cdf6ebd9d2795bdcd14162f38df568d51796 (patch) | |
| tree | 4be99f15c5a949b5b672c46543cefa4b1bba225b /indra/newview/FixBundle.cmake.in | |
| parent | 9ddbe775ebc06fe273f7946c6aca14d855f5fb5f (diff) | |
Revert to LL's OpenJPEG fork
System 2.5.2 caused too much rainbow in DeltaFPS. For now, the OpenJPEG
listed in autobuild.xml is 2.5.0. However, LL has recently got 2.5.2
too in their OpenJPEG fork repo, but we switch to that once it's the
one listed in autobuild.xml.
Reverting to the now maintained LL 3p-openjpeg should fix the texture
thrashing problem https://megapahit.com/show_bug.cgi?id=1 starting
from DeltaFPS.
Diffstat (limited to 'indra/newview/FixBundle.cmake.in')
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 0538918c9e..63b4cceca3 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -17,11 +17,6 @@ file(CREATE_LINK SYMBOLIC ) file(CREATE_LINK - "../../../../Frameworks/libopenjp2.7.dylib" - "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libopenjp2.7.dylib" - SYMBOLIC - ) -file(CREATE_LINK "../../../../Frameworks/libpng16.16.dylib" "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libpng16.16.dylib" SYMBOLIC @@ -172,9 +167,6 @@ execute_process( COMMAND lipo libopenal.1.23.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libopenal.1.23.1.dylib - COMMAND lipo libopenjp2.2.5.2.dylib - -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenjp2.2.5.2.dylib COMMAND lipo libpcre.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpcre.1.dylib @@ -246,7 +238,6 @@ execute_process( Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib Frameworks/libopenal.1.23.1.dylib - Frameworks/libopenjp2.2.5.2.dylib Frameworks/libpcre.1.dylib Frameworks/libpcrecpp.0.dylib Frameworks/libpng16.16.dylib |