diff options
| author | leviathan <leviathan@lindenlab.com> | 2024-09-03 15:38:35 -0700 |
|---|---|---|
| committer | Andrew Meadows <andrew.l.meadows@gmail.com> | 2024-10-03 09:16:46 -0700 |
| commit | 0617923ae7f450ece7288f8a73446c45a8ed32db (patch) | |
| tree | 1914627e41be3619eb335aa28e6acdfb98925ea0 /indra/cmake | |
| parent | 8213a0fb6b3149042d6833c8f0c4a3c1bfdc8bc9 (diff) | |
remove crashy LLSD ctor used by GameControl
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-COMPILE-LINK-RUN.txt | 2 | ||||
| -rw-r--r-- | indra/cmake/UI.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/cmake/00-COMPILE-LINK-RUN.txt b/indra/cmake/00-COMPILE-LINK-RUN.txt index 1933072a6d..6cff0c0f28 100644 --- a/indra/cmake/00-COMPILE-LINK-RUN.txt +++ b/indra/cmake/00-COMPILE-LINK-RUN.txt @@ -162,7 +162,7 @@ Linking * Update the autobuild.xml of ALL consumers of the library. In the case of zlib, that meant updating freetype, libpng, openssl, - libxml2, fontconfig, curl, Boost, SDL, llqtwebkit, google-mock and + libxml2, fontconfig, curl, Boost, SDL2, llqtwebkit, google-mock and colladadom. * Confirm by test and observation that the consumers actually use diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 0df62808e7..ae039b4a47 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -21,9 +21,10 @@ if (LINUX) Xext Xft Xinerama + X11 ll::fontconfig ll::freetype - ll::SDL + ll::SDL2 ll::glib ll::gio ) |