diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
| commit | c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 (patch) | |
| tree | c735cd065521eb5b2d719f78e1685c090b265ea6 /indra/cmake/LLWindow.cmake | |
| parent | 8c0aa31536c447edb6ef4fbee43f99debf593a20 (diff) | |
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
Diffstat (limited to 'indra/cmake/LLWindow.cmake')
| -rw-r--r-- | indra/cmake/LLWindow.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 1ee4ca0aac..81e58b2bea 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -1,6 +1,6 @@ # -*- cmake -*- -include(OpenGL) +include(GLEXT) include(Prebuilt) if (STANDALONE) @@ -14,12 +14,12 @@ if (STANDALONE) ) else (STANDALONE) use_prebuilt_binary(mesa) - if (LINUX AND VIEWER) + if (LINUX) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) set (SDL_LIBRARY SDL directfb fusion direct) - endif (LINUX AND VIEWER) + endif (LINUX) endif (STANDALONE) if (SDL_FOUND AND NOT BAKING) @@ -37,13 +37,13 @@ set(LLWINDOW_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llwindow ) -if ((SERVER AND LINUX) OR (BAKING AND LINUX)) +if (BAKING AND LINUX) set(LLWINDOW_LIBRARIES llwindowheadless ) MESSAGE( STATUS "using headless libraries") -else (SERVER AND LINUX) +else (BAKING AND LINUX) set(LLWINDOW_LIBRARIES llwindow ) -endif ((SERVER AND LINUX) OR (BAKING AND LINUX)) +endif (BAKING AND LINUX) |