Fixed file_nb_frames bug when video stream length is not available. Needs testing.

[casparcg] / core / CMakeLists.txt

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index a4d3c35866b833a3df8a92642b4eea498c2bbfed..98fdd7c8282286b307ae891e863218753caa43bd 100644 (file)
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -7,40 +7,44 @@ set(SOURCES
                consumer/port.cpp
 
                diagnostics/call_context.cpp
+               diagnostics/graph_to_log_sink.cpp
                diagnostics/osd_graph.cpp
                diagnostics/subject_diagnostics.cpp
 
+               frame/audio_channel_layout.cpp
                frame/draw_frame.cpp
                frame/frame.cpp
                frame/frame_transform.cpp
                frame/geometry.cpp
 
+               help/help_repository.cpp
+               help/util.cpp
+
                mixer/audio/audio_mixer.cpp
                mixer/image/blend_modes.cpp
                mixer/mixer.cpp
 
-               monitor/monitor.cpp
-
                producer/color/color_producer.cpp
 
-               producer/draw/freehand_producer.cpp
-
                producer/media_info/in_memory_media_info_repository.cpp
 
                producer/scene/const_producer.cpp
                producer/scene/expression_parser.cpp
                producer/scene/hotswap_producer.cpp
+               producer/scene/scene_cg_proxy.cpp
                producer/scene/scene_producer.cpp
                producer/scene/xml_scene_producer.cpp
 
                producer/separated/separated_producer.cpp
 
                producer/text/text_producer.cpp
+               producer/text/utils/freetype_library.cpp
                producer/text/utils/texture_atlas.cpp
                producer/text/utils/texture_font.cpp
 
                producer/transition/transition_producer.cpp
 
+               producer/cg_proxy.cpp
                producer/frame_producer.cpp
                producer/layer.cpp
                producer/stage.cpp
@@ -55,11 +59,14 @@ set(HEADERS
                consumer/frame_consumer.h
                consumer/output.h
                consumer/port.h
+               consumer/write_frame_consumer.h
 
                diagnostics/call_context.h
+               diagnostics/graph_to_log_sink.h
                diagnostics/osd_graph.h
                diagnostics/subject_diagnostics.h
 
+               frame/audio_channel_layout.h
                frame/draw_frame.h
                frame/frame.h
                frame/frame_factory.h
@@ -68,6 +75,10 @@ set(HEADERS
                frame/geometry.h
                frame/pixel_format.h
 
+               help/help_repository.h
+               help/help_sink.h
+               help/util.h
+
                interaction/interaction_aggregator.h
                interaction/interaction_event.h
                interaction/interaction_sink.h
@@ -79,8 +90,6 @@ set(HEADERS
 
                producer/color/color_producer.h
 
-               producer/draw/freehand_producer.h
-
                producer/media_info/in_memory_media_info_repository.h
                producer/media_info/media_info.h
                producer/media_info/media_info_repository.h
@@ -88,10 +97,12 @@ set(HEADERS
                producer/scene/const_producer.h
                producer/scene/expression_parser.h
                producer/scene/hotswap_producer.h
+               producer/scene/scene_cg_proxy.h
                producer/scene/scene_producer.h
                producer/scene/xml_scene_producer.h
 
                producer/text/utils/color.h
+               producer/text/utils/freetype_library.h
                producer/text/utils/string_metrics.h
                producer/text/utils/text_info.h
                producer/text/utils/texture_atlas.h
@@ -102,11 +113,14 @@ set(HEADERS
                producer/transition/transition_producer.h
 
                producer/binding.h
+               producer/cg_proxy.h
                producer/frame_producer.h
                producer/layer.h
                producer/stage.h
                producer/variable.h
 
+               fwd.h
+               module_dependencies.h
                system_info_provider.h
                StdAfx.h
                thumbnail_generator.h
@@ -129,9 +143,9 @@ source_group(sources ./*)
 source_group(sources\\consumer consumer/*)
 source_group(sources\\diagnostics diagnostics/*)
 source_group(sources\\frame frame/*)
+source_group(sources\\help help/*)
 source_group(sources\\interaction interaction/*)
 source_group(sources\\mixer mixer/*)
-source_group(sources\\producer\\draw producer/draw/*)
 source_group(sources\\producer\\media_info producer/media_info/*)
 source_group(sources\\producer\\scene producer/scene/*)
 source_group(sources\\producer\\text\\utils producer/text/utils/*)
@@ -139,4 +153,16 @@ source_group(sources\\producer\\text producer/text/*)
 source_group(sources\\producer\\transition producer/transition/*)
 source_group(sources\\producer producer/*)
 
-target_link_libraries(core common)
+if (MSVC)
+       target_link_libraries(core
+                       common
+
+                       freetype.lib
+       )
+else()
+       target_link_libraries(core
+                       common
+
+                       freetype
+       )
+endif()