diff options
Diffstat (limited to 'indra/cmake/LLWindow.cmake')
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/LLWindow.cmake | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index a5b9cf47a4..ba07a80f05 100644..100755 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -1,9 +1,10 @@ # -*- cmake -*- -include(OpenGL) +include(Variables) +include(GLEXT) include(Prebuilt) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindSDL) # This should be done by FindSDL. Sigh. @@ -12,18 +13,16 @@ if (STANDALONE) SDL_INCLUDE_DIR SDL_LIBRARY ) -else (STANDALONE) - use_prebuilt_binary(mesa) - if (LINUX AND VIEWER) +else (USESYSTEMLIBS) + if (LINUX) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) - set (SDL_LIBRARY SDL) - endif (LINUX AND VIEWER) -endif (STANDALONE) + set (SDL_LIBRARY SDL directfb fusion direct) + endif (LINUX) +endif (USESYSTEMLIBS) if (SDL_FOUND) - add_definitions(-DLL_SDL=1) include_directories(${SDL_INCLUDE_DIR}) endif (SDL_FOUND) @@ -32,12 +31,12 @@ set(LLWINDOW_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llwindow ) -if (SERVER AND LINUX) - set(LLWINDOW_LIBRARIES +if (BUILD_HEADLESS) + set(LLWINDOW_HEADLESS_LIBRARIES llwindowheadless ) -else (SERVER AND LINUX) +endif (BUILD_HEADLESS) + set(LLWINDOW_LIBRARIES llwindow ) -endif (SERVER AND LINUX) |