diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-20 17:13:16 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-20 17:13:16 +0000 |
| commit | e9e459c89cdfc57f32ffc7c421e01f43348f3b6c (patch) | |
| tree | 9ebf93afe52a8c238c14c19228ee7334e51f0ae5 /indra/cmake | |
| parent | 0fc7c2aac14eaf1f2dbe9e64c02e1b68ae3e70ec (diff) | |
Restoring llrenderheadless changes so we can fix them
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLRender.cmake | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake index e438872772..6695ed6bd9 100644 --- a/indra/cmake/LLRender.cmake +++ b/indra/cmake/LLRender.cmake @@ -8,18 +8,15 @@ set(LLRENDER_INCLUDE_DIRS ${GLH_INCLUDE_DIR} ) -#if ((SERVER OR BAKING) AND LINUX) -# set(LLRENDER_LIBRARIES -# llrenderheadless -# ) -#else ((SERVER OR BAKING) AND LINUX) -#set(LLRENDER_LIBRARIES -# llrender -# ) -#endif ((SERVER OR BAKING) AND LINUX) +if ((SERVER OR BAKING) AND LINUX) + set(LLRENDER_LIBRARIES + llrenderheadless + ) +else ((SERVER OR BAKING) AND LINUX) set(LLRENDER_LIBRARIES llrender ) +endif ((SERVER OR BAKING) AND LINUX) # mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set # differently for different object files. |