Skip to content
Snippets Groups Projects
Commit 8edf8b00 authored by Nyx Linden's avatar Nyx Linden
Browse files

BUILDFIX: not including headless libraries if we haven't defined llrenderheadless

parent ea98697c
No related branches found
No related tags found
No related merge requests found
...@@ -89,7 +89,6 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) ...@@ -89,7 +89,6 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
llrender llrender
) )
set_source_files_properties( set_source_files_properties(
${server_SOURCE_FILES} ${server_SOURCE_FILES}
PROPERTIES PROPERTIES
...@@ -99,12 +98,8 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) ...@@ -99,12 +98,8 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
${llrender_SOURCE_FILES} ${llrender_SOURCE_FILES}
${server_SOURCE_FILES} ${server_SOURCE_FILES}
) )
endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
add_library (llrender ${llrender_SOURCE_FILES}) target_link_libraries(llrenderheadless
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
target_link_libraries(llrender
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES} ${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES} ${LLMATH_LIBRARIES}
...@@ -113,10 +108,14 @@ target_link_libraries(llrender ...@@ -113,10 +108,14 @@ target_link_libraries(llrender
${LLXML_LIBRARIES} ${LLXML_LIBRARIES}
${LLVFS_LIBRARIES} ${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES} ${LLWINDOW_LIBRARIES}
${FREETYPE_LIBRARIES}
${OPENGL_LIBRARIES}) ${OPENGL_LIBRARIES})
target_link_libraries(llrenderheadless 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
# Sort by high-level to low-level
target_link_libraries(llrender
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES} ${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES} ${LLMATH_LIBRARIES}
...@@ -125,5 +124,6 @@ target_link_libraries(llrenderheadless ...@@ -125,5 +124,6 @@ target_link_libraries(llrenderheadless
${LLXML_LIBRARIES} ${LLXML_LIBRARIES}
${LLVFS_LIBRARIES} ${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES} ${LLWINDOW_LIBRARIES}
${FREETYPE_LIBRARIES}
${OPENGL_LIBRARIES}) ${OPENGL_LIBRARIES})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment