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/llwindow/CMakeLists.txt | |
| parent | 8213a0fb6b3149042d6833c8f0c4a3c1bfdc8bc9 (diff) | |
remove crashy LLSD ctor used by GameControl
Diffstat (limited to 'indra/llwindow/CMakeLists.txt')
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index ebac55cb9c..e86ef2d578 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -26,6 +26,7 @@ set(llwindow_SOURCE_FILES llgamecontroltranslator.cpp llkeyboard.cpp llkeyboardheadless.cpp + llsdl.cpp llwindowheadless.cpp llwindowcallbacks.cpp llwindow.cpp @@ -39,6 +40,7 @@ set(llwindow_HEADER_FILES llgamecontroltranslator.h llkeyboard.h llkeyboardheadless.h + llsdl.h llwindowheadless.h llwindowcallbacks.h ) @@ -63,7 +65,7 @@ set(llwindow_LINK_LIBRARIES ll::glm ll::glext ll::uilibraries - ll::SDL + ll::SDL2 ll::zlib-ng ) @@ -178,11 +180,11 @@ endif (llwindow_HEADER_FILES) ${viewer_SOURCE_FILES} ) -if (SDL_FOUND) +if (SDL2_FOUND) set_property(TARGET llwindow PROPERTY COMPILE_DEFINITIONS LL_SDL=1 ) -endif (SDL_FOUND) +endif (SDL2_FOUND) target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) target_include_directories(llwindow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) |