livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up universal build

master
Rye 2025-08-28 00:43:38 -04:00
parent 34ae3db498
commit 77d71dec86
5 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.xml
View File

@ -3171,7 +3171,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</map> </map>
</map> </map>
<key>build_directory</key> <key>build_directory</key>
<string>build-darwin-x86_64</string> <string>build-darwin-universal</string>
<key>name</key> <key>name</key>
<string>darwin64</string> <string>darwin64</string>
</map> </map>

2
build.sh
View File

@ -40,7 +40,7 @@ retry_cmd()
build_dir_Darwin() build_dir_Darwin()
{ {
echo build-darwin-x86_64 echo build-darwin-universal
} }
build_dir_Linux() build_dir_Linux()

6
indra/cmake/OpenJPEG.cmake
View File

@ -1,7 +1,9 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt)
include_guard() include_guard()
include(Prebuilt)
include(Linking)
add_library( ll::openjpeg INTERFACE IMPORTED ) add_library( ll::openjpeg INTERFACE IMPORTED )
use_system_binary(openjpeg) use_system_binary(openjpeg)

6
indra/cmake/Variables.cmake
View File

@ -184,9 +184,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "") set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "")
set(CMAKE_XCODE_ATTRIBUTE_DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING YES) set(CMAKE_XCODE_ATTRIBUTE_DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING YES)
set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO) set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO)
set(CMAKE_OSX_ARCHITECTURES "${ARCH}") if(NOT DEFINED CMAKE_OSX_ARCHITECTURES)
string(REPLACE "i686" "i386" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
string(REPLACE "AMD64" "x86_64" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") endif()
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Default deploy grid # Default deploy grid

21
indra/newview/viewer_manifest.py
View File

@ -1028,20 +1028,6 @@ class Darwin_x86_64_Manifest(ViewerManifest):
): ):
self.path2basename(relpkgdir, libfile) self.path2basename(relpkgdir, libfile)
# OpenAL dylibs
if self.args['openal'] == 'ON':
for libfile in (
"libopenal.dylib",
"libalut.dylib",
):
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
oldpath = os.path.join("@rpath", libfile)
self.run_command(
['install_name_tool', '-change', oldpath,
'@executable_path/../Resources/%s' % libfile,
executable])
# our apps # our apps
executable_path = {} executable_path = {}
embedded_apps = [ (os.path.join("llplugin", "slplugin"), "SLPlugin.app") ] embedded_apps = [ (os.path.join("llplugin", "slplugin"), "SLPlugin.app") ]
@ -1052,13 +1038,6 @@ class Darwin_x86_64_Manifest(ViewerManifest):
executable_path[app] = \ executable_path[app] = \
self.dst_path_of(os.path.join(app, "Contents", "MacOS")) self.dst_path_of(os.path.join(app, "Contents", "MacOS"))
# our apps dependencies on shared libs
# for each app, for each dylib we collected in dylibs,
# create a symlink to the real copy of the dylib.
with self.prefix(dst=os.path.join(app, "Contents", "Resources")):
for libfile in dylibs:
self.relsymlinkf(os.path.join(libfile_parent, libfile))
# Dullahan helper apps go inside SLPlugin.app # Dullahan helper apps go inside SLPlugin.app
with self.prefix(dst=os.path.join( with self.prefix(dst=os.path.join(
"SLPlugin.app", "Contents", "Frameworks")): "SLPlugin.app", "Contents", "Frameworks")):