edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #688 from heinrich5991/pr_ddnet_cmake_client_link_order

Browse source 
Fix link order for the client libraries
This commit is contained in:
Dennis Felsing 2017-03-20 08:29:30 +01:00 committed by GitHub
parent f5446ca3b0 d10ab196f5
commit 90b51d140a
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -120,7 +120,11 @@ if(TARGET_OS STREQUAL "windows")
set(PLATFORM_LIBS ws2_32) # Windows sockets
else()
set(PLATFORM_CLIENT_LIBS GL GLU X11)
set(PLATFORM_LIBS)
if(TARGET_OS STREQUAL "linux")
set(PLATFORM_LIBS rt) # clock_gettime for glibc < 2.17
else()
set(PLATFORM_LIBS)
endif()
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU)
@ -277,10 +281,13 @@ if(CLIENT)
${LIBS}
${CURL_LIBRARIES}
${FREETYPE_LIBRARIES}
${OGG_LIBRARIES}
${SDL2_LIBRARIES}
# Order of these three is important.
${OPUSFILE_LIBRARIES}
${OPUS_LIBRARIES}
${SDL2_LIBRARIES}
${OGG_LIBRARIES}
${PLATFORM_CLIENT_LIBS}
)