1
0

Merge branch 'master' into c++11Events

This commit is contained in:
Mattes D
2014-10-24 10:13:54 +02:00
45 changed files with 305 additions and 190 deletions

View File

@@ -39,6 +39,10 @@ if(NOT MSVC)
add_library(OSSupport ${SRCS} ${HDRS})
if(UNIX)
target_link_libraries(OSSupport pthread rt)
if(NOT APPLE)
target_link_libraries(OSSupport rt)
endif()
target_link_libraries(OSSupport pthread)
endif()
endif()