diff options
| author | Callum Linden <callum@lindenlab.com> | 2023-01-23 15:10:17 -0800 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2023-01-23 15:10:17 -0800 |
| commit | f9fbd0333abb474ed265e1be67b2c5b1a4174444 (patch) | |
| tree | 15587f9545597569527d4f8fb5afb03fbf9350a5 | |
| parent | 64e84924d43b64fd799e619cc3c5c9aac2d23ce1 (diff) | |
DRTVWR-489-emoji: Update the machinery that copies over the ICU4C DLLs into the right place in Windows builds
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 9 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 10 |
2 files changed, 19 insertions, 0 deletions
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") |