From d9e82ab14aaa3e0daceacda8cf72ade379e9caf1 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 17:04:35 -0800
Subject: [PATCH] DRTVWR-489-emoji: Pull in some small changes from Kitty's
work to move the macOS build forwards
---
indra/cmake/ICU4C.cmake | 4 ++--
indra/llrender/llfontregistry.cpp | 2 +-
indra/newview/CMakeLists.txt | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index 007a9b6937a..b51087e0e73 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -10,8 +10,8 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(icu4c)
if (WINDOWS)
set(ICU4C_LIBRARY icuuc)
- #elseif(DARWIN)
- # set(ICU4C_LIBRARY ...)
+ elseif(DARWIN)
+ set(ICU4C_LIBRARY icuuc)
#elseif(LINUX)
# set(ICU4C_LIBRARY ...)
else()
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 44f2bd4cc5d..c9a9ee3a033 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -483,7 +483,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
#if LL_DARWIN
font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY);
font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY + MACOSX_FONT_SUPPLEMENTAL);
- font_search_paths.push_back(sys_path + MACOSX_FONT_SUPPLEMENTAL);
+ font_search_paths.push_back(LLFontGL::getFontPathSystem() + MACOSX_FONT_SUPPLEMENTAL);
#endif
// The fontname string may contain multiple font file names separated by semicolons.
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 36f4680c446..ee55657dd84 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -449,7 +449,7 @@ set(viewer_SOURCE_FILES
llpaneleditsky.cpp
llpaneleditwater.cpp
llpaneleditwearable.cpp
- llpanelemojicomplete.cpp
+ llpanelemojicomplete.cpp
llpanelenvironment.cpp
llpanelexperiencelisteditor.cpp
llpanelexperiencelog.cpp
@@ -1081,7 +1081,7 @@ set(viewer_HEADER_FILES
llpaneleditsky.h
llpaneleditwater.h
llpaneleditwearable.h
- llpanelemojicomplete.h
+ llpanelemojicomplete.h
llpanelenvironment.h
llpanelexperiencelisteditor.h
llpanelexperiencelog.h
@@ -1506,12 +1506,6 @@ if (WINDOWS)
set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
endif(USE_PRECOMPILED_HEADERS)
- message("Copying fonts")
- file(GLOB FONT_FILE_GLOB_LIST
- "${AUTOBUILD_INSTALL_DIR}/fonts/*"
- )
- file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
-
# Replace the icons with the appropriate ones for the channel
# ('test' is the default)
set(ICON_PATH "test")
@@ -2087,6 +2081,12 @@ endif (USE_BUGSPLAT)
set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
"Path to artwork files.")
+message("Copying fonts")
+file(GLOB FONT_FILE_GLOB_LIST
+ "${AUTOBUILD_INSTALL_DIR}/fonts/*"
+)
+file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
+
if (LINUX)
set(product SecondLife-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
--
GitLab