* Replaced boost::timer with caspar::timer because of too low resolution on Linux...

[casparcg] / common / CMakeLists.txt

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 5564e79708d2ba6e4c605d4914fd00c1fd35456c..cd3c646a1c136e96398cbcedff74c9175f7111fd 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -79,6 +79,7 @@ set(HEADERS
                reactive.h
                semaphore.h
                stdafx.h
+               timer.h
                tweener.h
                utf.h
 )
@@ -147,3 +148,17 @@ else ()
                pthread
        )
 endif ()
+
+if(MSVC)
+       casparcg_add_runtime_dependency("${GLEW_BIN_PATH}/glew32.dll")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbb.dll")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbb_debug.dll")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc.dll")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_debug.dll")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_proxy.dll")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_proxy_debug.dll")
+else()
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/libtbb.so.2")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/libtbbmalloc_proxy.so.2")
+       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/libtbbmalloc.so.2")
+endif()