From d1e66eca33c42f6100644f08072c9f6b025a01b9 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 7 Nov 2025 14:52:08 +0800 Subject: Use ibtool to compile the .xib to .nib --- indra/newview/CMakeLists.txt | 5 +++++ indra/newview/SecondLife.nib | Bin 11888 -> 0 bytes indra/newview/ViewerInstall.cmake | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 indra/newview/SecondLife.nib diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e033fd57bf..3ca3ab997d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2424,6 +2424,11 @@ elseif (CMAKE_SYSTEM_NAME MATCHES FreeBSD AND PACKAGE) endif (LINUX) if (DARWIN) + execute_process( + COMMAND ibtool --compile + ${CMAKE_CURRENT_BINARY_DIR}/SecondLife.nib + ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.xib + ) # These all get set with PROPERTIES. It's not that the property names are # magically known to CMake -- it's that these names are referenced in the # Info-SecondLife.plist file in the configure_file() directive below. diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib deleted file mode 100644 index ef0fa80b12..0000000000 Binary files a/indra/newview/SecondLife.nib and /dev/null differ diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 2c31d52e8b..e94a212151 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -31,7 +31,7 @@ if (DARWIN) ) install(FILES - SecondLife.nib + ${CMAKE_CURRENT_BINARY_DIR}/SecondLife.nib ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt cube.dae featuretable_mac.txt -- cgit v1.2.3