Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai
commit
a912a5e23d
|
|
@ -180,7 +180,7 @@ if (LINUX)
|
|||
# this stops us requiring a really recent glibc at runtime
|
||||
add_definitions(-fno-stack-protector)
|
||||
# linking can be very memory-hungry, especially the final viewer link
|
||||
set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory,FORCE:MULTIPLE")
|
||||
set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
|
||||
endif (NOT STANDALONE)
|
||||
endif (VIEWER)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue