diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-26 18:25:26 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-26 18:25:26 -0400 |
| commit | a43d242d00ef06934f9473444297fffe50760f93 (patch) | |
| tree | 6f557d2a183f626d7b53c4ecf0f9678439c90ce7 /indra/cmake/LLRender.cmake | |
| parent | 0bb1324a27d4dd94d6f8a9d445ab892127f48c5f (diff) | |
| parent | 95f3fb45ae2f4fe199e34f35be1e46b3a598ca1a (diff) | |
merge
Diffstat (limited to 'indra/cmake/LLRender.cmake')
| -rw-r--r-- | indra/cmake/LLRender.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake index 8427928151..6695ed6bd9 100644 --- a/indra/cmake/LLRender.cmake +++ b/indra/cmake/LLRender.cmake @@ -8,15 +8,15 @@ set(LLRENDER_INCLUDE_DIRS ${GLH_INCLUDE_DIR} ) -if (SERVER AND LINUX) +if ((SERVER OR BAKING) AND LINUX) set(LLRENDER_LIBRARIES llrenderheadless ) -else (SERVER AND LINUX) +else ((SERVER OR BAKING) AND LINUX) set(LLRENDER_LIBRARIES llrender ) -endif (SERVER AND LINUX) +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. |