1 files changed, 7 insertions, 4 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 08b3df87ab..69f11991ea 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -52,7 +52,6 @@ set(llwindow_LINK_LIBRARIES
         llcommon
         llimage
         llmath
-        llrender
         llfilesystem
         llxml
         ll::glm
@@ -60,9 +59,12 @@ set(llwindow_LINK_LIBRARIES
         ll::uilibraries
         ll::SDL
         )
+
+include_directories(${CMAKE_SOURCE_DIR}/llrender)
+
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
-if (LINUX)
+if (NOT (DARWIN OR WINDOWS))
   list(APPEND viewer_SOURCE_FILES
        llkeyboardsdl.cpp
        llwindowsdl.cpp
@@ -84,8 +86,7 @@ if (LINUX)
         fontconfig          # For FCInit and other FC* functions.
         )
   endif (BUILD_HEADLESS)
-
-endif (LINUX)
+endif ()
 
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES
@@ -184,3 +185,5 @@ endif (SDL_FOUND)
 if (DARWIN)
   target_link_libraries(llwindow ${CARBON_LIBRARY})
 endif (DARWIN)
+
+include(LibraryInstall)