diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 14 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 12 |
3 files changed, 14 insertions, 14 deletions
@@ -117,7 +117,7 @@ $ megapahit ### macOS ``` -$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost188 +universal glm hunspell +universal freetype +universal minizip +universal openjpeg +universal libvorbis +universal xxhashlib +$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost188 +universal glm hunspell +universal freetype +universal minizip +universal nghttp2 +universal openjpeg +universal libvorbis +universal xxhashlib $ export LL_BUILD="-O3 -gdwarf-2 -stdlib=libc++ -mmacosx-version-min=11 -iwithsysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -std=c++20 -fPIC -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG -DPIC -DLL_DARWIN=1" $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=newview/Megapahit.app/Contents/Resources -DCMAKE_OSX_ARCHITECTURES:STRING=`uname -m` -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11 -DENABLE_SIGNING:BOOL=ON -DSIGNING_IDENTITY:STRING=- ../indra $ make -j`sysctl -n hw.ncpu` 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 |