From f9fbd0333abb474ed265e1be67b2c5b1a4174444 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Mon, 23 Jan 2023 15:10:17 -0800
Subject: DRTVWR-489-emoji: Update the machinery that copies over the ICU4C
 DLLs into the right place in Windows builds

---
 indra/cmake/Copy3rdPartyLibs.cmake |  9 +++++++++
 indra/newview/viewer_manifest.py   | 10 ++++++++++
 2 files changed, 19 insertions(+)

(limited to 'indra')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index ff705101de..439bec865c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -61,6 +61,15 @@ if(WINDOWS)
         uriparser.dll
         )
 
+    # ICU4C (same filenames for 32 and 64 bit builds)
+    set(release_files ${release_files} icudt48.dll)
+    set(release_files ${release_files} icuin48.dll)
+    set(release_files ${release_files} icuio48.dll)
+    set(release_files ${release_files} icule48.dll)
+    set(release_files ${release_files} iculx48.dll)
+    set(release_files ${release_files} icutu48.dll)
+    set(release_files ${release_files} icuuc48.dll)
+
     # OpenSSL
     if(ADDRESS_SIZE EQUAL 64)
         set(release_files ${release_files} libcrypto-1_1-x64.dll)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8cc1cc5bb4..26983bbba8 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -517,6 +517,16 @@ class WindowsManifest(ViewerManifest):
                 self.path("OpenAL32.dll")
                 self.path("alut.dll")
 
+            # For ICU4C
+            self.path("")
+            self.path("icudt48.dll")
+            self.path("icuin48.dll")
+            self.path("icuio48.dll")
+            self.path("icule48.dll")
+            self.path("iculx48.dll")
+            self.path("icutu48.dll")
+            self.path("icuuc48.dll")
+
             # For textures
             self.path("openjpeg.dll")
 
-- 
cgit v1.2.3