Merge branch 'CasparCG:master' into tk-cutfade

Author: TomKaltz

src/common/filesystem.cpp

@@ -26,6 +26,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
+#include <boost/filesystem/directory.hpp>
 
 namespace caspar {
 

src/common/log.cpp

@@ -26,6 +26,7 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/core/null_deleter.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <boost/lexical_cast.hpp>
 #include <boost/locale.hpp>
 #include <boost/log/attributes/function.hpp>
 #include <boost/log/core.hpp>

src/core/CMakeLists.txt

@@ -99,4 +99,8 @@ source_group(sources\\producer\\route producer/route/*)
 source_group(sources\\producer\\transition producer/transition/*)
 source_group(sources\\producer\\separated producer/separated/*)
 
-target_link_libraries(core common)
+target_link_libraries(
+	core
+	${SFML_LIBRARIES}
+	common
+)

src/modules/decklink/consumer/config.h

@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <boost/property_tree/ptree.hpp>
+
 #include <core/frame/pixel_format.h>
 #include <core/video_format.h>
 

src/modules/ffmpeg/consumer/ffmpeg_consumer.cpp

@@ -74,6 +74,7 @@ extern "C" {
 #include <tbb/parallel_invoke.h>
 
 #include <memory>
+#include <optional>
 #include <thread>
 
 namespace caspar { namespace ffmpeg {

src/shell/CMakeLists.txt

@@ -82,7 +82,6 @@ else ()
 	target_link_libraries(casparcg
 		${Boost_LIBRARIES}
 		${TBB_LIBRARIES}
-		${SFML_LIBRARIES}
 		${GLEW_LIBRARIES}
 		OpenGL::GL
 		${X11_LIBRARIES}