X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=a4bc89b88dc0f5501da29bfbff57399e779aef38;hb=81999f0b425ccb78db8c1c766dc34a79f5d0ee1d;hp=b5f748d07674b58f436d1abd27368c47a64db142;hpb=e06c10cd54f0fa15a644f4b383e2e07c7c944f45;p=casparcg

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index b5f748d07..a4bc89b88 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -8,9 +8,11 @@ set(SOURCES
 
 		base64.cpp
 		env.cpp
+		filesystem.cpp
 		log.cpp
 		polling_filesystem_monitor.cpp
 		stdafx.cpp
+		thread_info.cpp
 		tweener.cpp
 		utf.cpp
 )
@@ -20,11 +22,10 @@ if (MSVC)
 			compiler/vs/StackWalker.cpp
 			compiler/vs/StackWalker.h
 
-			os/windows/current_version.h
 			os/windows/filesystem.cpp
 			os/windows/page_locked_allocator.cpp
 			os/windows/prec_timer.cpp
-			os/windows/scheduling.cpp
+			os/windows/threading.cpp
 			os/windows/stack_trace.cpp
 			os/windows/system_info.cpp
 			os/windows/win32_exception.cpp
@@ -36,7 +37,7 @@ elseif (CMAKE_COMPILER_IS_GNUCXX)
 			os/linux/filesystem.cpp
 			os/linux/prec_timer.cpp
 			os/linux/signal_handlers.cpp
-			os/linux/scheduling.cpp
+			os/linux/threading.cpp
 			os/linux/stack_trace.cpp
 			os/linux/system_info.cpp
 	)
@@ -49,7 +50,7 @@ set(HEADERS
 		os/filesystem.h
 		os/general_protection_fault.h
 		os/page_locked_allocator.h
-		os/scheduling.h
+		os/threading.h
 		os/stack_trace.h
 		os/system_info.h
 
@@ -64,6 +65,7 @@ set(HEADERS
 		env.h
 		except.h
 		executor.h
+		filesystem.h
 		filesystem_monitor.h
 		forward.h
 		future.h
@@ -72,13 +74,16 @@ set(HEADERS
 		lock.h
 		log.h
 		memory.h
+		memcpy.h
+		memset.h
 		memshfl.h
 		param.h
 		polling_filesystem_monitor.h
 		prec_timer.h
-		reactive.h
+		scope_exit.h
 		semaphore.h
 		stdafx.h
+		thread_info.h
 		timer.h
 		tweener.h
 		utf.h
@@ -88,6 +93,7 @@ add_library(common ${SOURCES} ${HEADERS} ${OS_SPECIFIC_SOURCES})
 add_precompiled_header(common stdafx.h FORCEINCLUDE)
 
 include_directories(..)
+include_directories(${ASMLIB_INCLUDE_PATH})
 include_directories(${BOOST_INCLUDE_PATH})
 include_directories(${RXCPP_INCLUDE_PATH})
 include_directories(${TBB_INCLUDE_PATH})
@@ -153,10 +159,12 @@ 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")
+
+	# Reenable when tbb gets official support for vc14
+	# 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("${GLEW_BIN_PATH}/libGLEW.so.1.12")
 	casparcg_add_runtime_dependency("${TBB_BIN_PATH}/libtbb.so.2")