diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-20 05:07:09 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-20 05:07:09 +0000 |
| commit | ed08113ce0e21471498c410a5e66c9e4c2b7a394 (patch) | |
| tree | dfe0d3044a8244364027d5a2c51b37139d8c1083 | |
| parent | f8512c9191f662fee1cd0041af14d307fe103f0b (diff) | |
Temporarily disabling llrenderheadless due to build issues
| -rw-r--r-- | indra/cmake/LLRender.cmake | 15 | ||||
| -rw-r--r-- | indra/llrender/CMakeLists.txt | 54 |
2 files changed, 36 insertions, 33 deletions
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake index 6695ed6bd9..e438872772 100644 --- a/indra/cmake/LLRender.cmake +++ b/indra/cmake/LLRender.cmake @@ -8,15 +8,18 @@ set(LLRENDER_INCLUDE_DIRS ${GLH_INCLUDE_DIR} ) -if ((SERVER OR BAKING) AND LINUX) - set(LLRENDER_LIBRARIES - llrenderheadless - ) -else ((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) 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. diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index 638ab23bd6..e45b55ef59 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -83,23 +83,23 @@ list(APPEND llrender_SOURCE_FILES llrender.cpp llrendertarget.cpp ) -if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) - copy_server_sources( - llgl - llrender - ) - - - set_source_files_properties( - ${server_SOURCE_FILES} - PROPERTIES - COMPILE_FLAGS "-DLL_MESA=1 -DLL_MESA_HEADLESS=1" - ) - add_library (llrenderheadless - ${llrender_SOURCE_FILES} - ${server_SOURCE_FILES} - ) -endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) + #if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) + # copy_server_sources( + # llgl + # llrender + # ) + # + # + # set_source_files_properties( + # ${server_SOURCE_FILES} + # PROPERTIES + # COMPILE_FLAGS "-DLL_MESA=1 -DLL_MESA_HEADLESS=1" + # ) +# add_library (llrenderheadless +# ${llrender_SOURCE_FILES} +# ${server_SOURCE_FILES} +# ) +#endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) add_library (llrender ${llrender_SOURCE_FILES}) # Libraries on which this library depends, needed for Linux builds @@ -116,14 +116,14 @@ target_link_libraries(llrender ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES}) -target_link_libraries(llrenderheadless - ${LLCOMMON_LIBRARIES} - ${LLIMAGE_LIBRARIES} - ${LLMATH_LIBRARIES} - ${LLRENDER_LIBRARIES} - ${LLVFS_LIBRARIES} - ${LLXML_LIBRARIES} - ${LLVFS_LIBRARIES} - ${LLWINDOW_LIBRARIES} - ${OPENGL_LIBRARIES}) +#target_link_libraries(llrenderheadless +# ${LLCOMMON_LIBRARIES} +# ${LLIMAGE_LIBRARIES} +# ${LLMATH_LIBRARIES} +# ${LLRENDER_LIBRARIES} +# ${LLVFS_LIBRARIES} +# ${LLXML_LIBRARIES} +# ${LLVFS_LIBRARIES} +# ${LLWINDOW_LIBRARIES} +# ${OPENGL_LIBRARIES}) |