diff options
Diffstat (limited to 'indra/newview/FixBundle.cmake.in')
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 53885896cc..829c19e5e4 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -10,6 +10,11 @@ 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 @@ -187,9 +192,6 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libcollada14dom.2.3-r4.dylib - -thin ${CMAKE_OSX_ARCHITECTURES} - -output libcollada14dom.2.3-r4.dylib COMMAND lipo libexpat.1.10.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libexpat.1.10.0.dylib @@ -235,15 +237,12 @@ execute_process( COMMAND lipo libogg.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libogg.0.dylib - COMMAND lipo libopenal.1.24.1.dylib - -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.24.1.dylib - COMMAND lipo libpcre.1.dylib + COMMAND lipo libopenal.1.24.2.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libpcre.1.dylib - COMMAND lipo libpcrecpp.0.dylib + -output libopenal.1.24.2.dylib + COMMAND lipo libopenjp2.2.5.3.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libpcrecpp.0.dylib + -output libopenjp2.2.5.3.dylib COMMAND lipo libpng16.16.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpng16.16.dylib @@ -294,7 +293,6 @@ execute_process( Frameworks/libbrotlicommon.1.1.0.dylib Frameworks/libbrotlidec.1.1.0.dylib Frameworks/libbz2.1.0.8.dylib - Frameworks/libcollada14dom.2.3-r4.dylib Frameworks/libexpat.1.10.0.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib @@ -310,9 +308,8 @@ execute_process( Frameworks/libndofdev.dylib Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib - Frameworks/libopenal.1.24.1.dylib - Frameworks/libpcre.1.dylib - Frameworks/libpcrecpp.0.dylib + Frameworks/libopenal.1.24.2.dylib + Frameworks/libopenjp2.2.5.3.dylib Frameworks/libpng16.16.dylib Frameworks/libvlc.5.dylib Frameworks/libvlccore.9.dylib |