]> git.sesse.net Git - casparcg/commitdiff
* Added some libraries in linux
authorHelge Norberg <helge.norberg@svt.se>
Fri, 10 Apr 2015 22:17:49 +0000 (00:17 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Fri, 10 Apr 2015 22:17:49 +0000 (00:17 +0200)
234 files changed:
CMakeLists.txt
common/CMakeLists.txt
common/os/linux/prec_timer.cpp [new file with mode: 0644]
core/consumer/frame_consumer.cpp
core/producer/frame_producer.cpp
core/producer/scene/expression_parser.cpp
core/producer/scene/expression_parser.h
dependencies64/boost/stage/lib/linux/libboost_atomic.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_chrono.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_container.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_context.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_coroutine.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_date_time.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_exception.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_filesystem.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_graph.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_locale.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_log.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_log_setup.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_math_c99.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_math_c99f.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_math_c99l.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_math_tr1.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_math_tr1f.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_math_tr1l.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_prg_exec_monitor.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_program_options.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_python.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_random.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_regex.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_serialization.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_signals.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_system.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_test_exec_monitor.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_thread.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_timer.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_unit_test_framework.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_wave.a [new file with mode: 0644]
dependencies64/boost/stage/lib/linux/libboost_wserialization.a [new file with mode: 0644]
dependencies64/boost/stage/lib/win32/libboost_atomic-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_atomic-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_atomic-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_atomic-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_bzip2-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_bzip2-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_bzip2-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_bzip2-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_chrono-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_chrono-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_chrono-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_chrono-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_container-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_container-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_container-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_container-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_context-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_context-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_context-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_context-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_coroutine-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_coroutine-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_coroutine-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_coroutine-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_date_time-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_date_time-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_date_time-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_date_time-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_exception-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_exception-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_exception-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_exception-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_filesystem-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_filesystem-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_filesystem-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_filesystem-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_graph-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_graph-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_graph-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_graph-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_iostreams-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_iostreams-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_iostreams-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_iostreams-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_locale-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_locale-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_locale-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_locale-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_log-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_log-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_log-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_log-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_log_setup-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_log_setup-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_log_setup-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_log_setup-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_c99-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_c99-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_c99-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_c99-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_c99f-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_c99f-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_c99f-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_c99f-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_c99l-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_c99l-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_c99l-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_c99l-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_tr1-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_tr1-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_tr1-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_tr1-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_tr1f-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_tr1f-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_tr1f-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_tr1f-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_tr1l-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_tr1l-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_math_tr1l-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_math_tr1l-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_prg_exec_monitor-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_prg_exec_monitor-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_prg_exec_monitor-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_prg_exec_monitor-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_program_options-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_program_options-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_program_options-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_program_options-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_python-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_python-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_python-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_python-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_random-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_random-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_random-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_random-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_regex-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_regex-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_regex-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_regex-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_serialization-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_serialization-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_serialization-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_serialization-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_signals-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_signals-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_signals-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_signals-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_system-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_system-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_system-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_system-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_test_exec_monitor-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_test_exec_monitor-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_test_exec_monitor-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_test_exec_monitor-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_thread-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_thread-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_thread-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_thread-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_timer-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_timer-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_timer-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_timer-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_unit_test_framework-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_unit_test_framework-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_unit_test_framework-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_unit_test_framework-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_wave-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_wave-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_wserialization-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_wserialization-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_wserialization-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_wserialization-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_zlib-vc120-mt-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_zlib-vc120-mt-1_57.lib with 100% similarity]
dependencies64/boost/stage/lib/win32/libboost_zlib-vc120-mt-gd-1_57.lib [moved from dependencies64/boost/stage/lib/libboost_zlib-vc120-mt-gd-1_57.lib with 100% similarity]
dependencies64/ffmpeg/bin/linux/libavcodec.so [new symlink]
dependencies64/ffmpeg/bin/linux/libavcodec.so.55 [new file with mode: 0755]
dependencies64/ffmpeg/bin/linux/libavdevice.so [new file with mode: 0755]
dependencies64/ffmpeg/bin/linux/libavfilter.so [new symlink]
dependencies64/ffmpeg/bin/linux/libavfilter.so.4 [new file with mode: 0755]
dependencies64/ffmpeg/bin/linux/libavformat.so [new symlink]
dependencies64/ffmpeg/bin/linux/libavformat.so.55 [new file with mode: 0755]
dependencies64/ffmpeg/bin/linux/libavutil.so [new symlink]
dependencies64/ffmpeg/bin/linux/libavutil.so.52 [new file with mode: 0755]
dependencies64/ffmpeg/bin/linux/libpostproc.so [new file with mode: 0755]
dependencies64/ffmpeg/bin/linux/libswresample.so [new symlink]
dependencies64/ffmpeg/bin/linux/libswresample.so.0 [new file with mode: 0755]
dependencies64/ffmpeg/bin/linux/libswscale.so [new symlink]
dependencies64/ffmpeg/bin/linux/libswscale.so.2 [new file with mode: 0755]
dependencies64/ffmpeg/bin/win32/avcodec-55.dll [moved from dependencies64/ffmpeg/bin/avcodec-55.dll with 100% similarity]
dependencies64/ffmpeg/bin/win32/avdevice-55.dll [moved from dependencies64/ffmpeg/bin/avdevice-55.dll with 100% similarity]
dependencies64/ffmpeg/bin/win32/avfilter-4.dll [moved from dependencies64/ffmpeg/bin/avfilter-4.dll with 100% similarity]
dependencies64/ffmpeg/bin/win32/avformat-55.dll [moved from dependencies64/ffmpeg/bin/avformat-55.dll with 100% similarity]
dependencies64/ffmpeg/bin/win32/avutil-52.dll [moved from dependencies64/ffmpeg/bin/avutil-52.dll with 100% similarity]
dependencies64/ffmpeg/bin/win32/ffmpeg.exe [moved from dependencies64/ffmpeg/bin/ffmpeg.exe with 100% similarity]
dependencies64/ffmpeg/bin/win32/ffplay.exe [moved from dependencies64/ffmpeg/bin/ffplay.exe with 100% similarity]
dependencies64/ffmpeg/bin/win32/ffprobe.exe [moved from dependencies64/ffmpeg/bin/ffprobe.exe with 100% similarity]
dependencies64/ffmpeg/bin/win32/postproc-52.dll [moved from dependencies64/ffmpeg/bin/postproc-52.dll with 100% similarity]
dependencies64/ffmpeg/bin/win32/swresample-0.dll [moved from dependencies64/ffmpeg/bin/swresample-0.dll with 100% similarity]
dependencies64/ffmpeg/bin/win32/swscale-2.dll [moved from dependencies64/ffmpeg/bin/swscale-2.dll with 100% similarity]
dependencies64/ffmpeg/lib/linux [new symlink]
dependencies64/ffmpeg/lib/win32/avcodec-55.def [moved from dependencies64/ffmpeg/lib/avcodec-55.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/avcodec.lib [moved from dependencies64/ffmpeg/lib/avcodec.lib with 100% similarity]
dependencies64/ffmpeg/lib/win32/avdevice-55.def [moved from dependencies64/ffmpeg/lib/avdevice-55.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/avdevice.lib [moved from dependencies64/ffmpeg/lib/avdevice.lib with 100% similarity]
dependencies64/ffmpeg/lib/win32/avfilter-4.def [moved from dependencies64/ffmpeg/lib/avfilter-4.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/avfilter.lib [moved from dependencies64/ffmpeg/lib/avfilter.lib with 100% similarity]
dependencies64/ffmpeg/lib/win32/avformat-55.def [moved from dependencies64/ffmpeg/lib/avformat-55.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/avformat.lib [moved from dependencies64/ffmpeg/lib/avformat.lib with 100% similarity]
dependencies64/ffmpeg/lib/win32/avutil-52.def [moved from dependencies64/ffmpeg/lib/avutil-52.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/avutil.lib [moved from dependencies64/ffmpeg/lib/avutil.lib with 100% similarity]
dependencies64/ffmpeg/lib/win32/libavcodec.dll.a [moved from dependencies64/ffmpeg/lib/libavcodec.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/libavdevice.dll.a [moved from dependencies64/ffmpeg/lib/libavdevice.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/libavfilter.dll.a [moved from dependencies64/ffmpeg/lib/libavfilter.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/libavformat.dll.a [moved from dependencies64/ffmpeg/lib/libavformat.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/libavutil.dll.a [moved from dependencies64/ffmpeg/lib/libavutil.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/libpostproc.dll.a [moved from dependencies64/ffmpeg/lib/libpostproc.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/libswresample.dll.a [moved from dependencies64/ffmpeg/lib/libswresample.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/libswscale.dll.a [moved from dependencies64/ffmpeg/lib/libswscale.dll.a with 100% similarity]
dependencies64/ffmpeg/lib/win32/postproc-52.def [moved from dependencies64/ffmpeg/lib/postproc-52.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/postproc.lib [moved from dependencies64/ffmpeg/lib/postproc.lib with 100% similarity]
dependencies64/ffmpeg/lib/win32/swresample-0.def [moved from dependencies64/ffmpeg/lib/swresample-0.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/swresample.lib [moved from dependencies64/ffmpeg/lib/swresample.lib with 100% similarity]
dependencies64/ffmpeg/lib/win32/swscale-2.def [moved from dependencies64/ffmpeg/lib/swscale-2.def with 100% similarity]
dependencies64/ffmpeg/lib/win32/swscale.lib [moved from dependencies64/ffmpeg/lib/swscale.lib with 100% similarity]
dependencies64/freeimage/bin/linux [new symlink]
dependencies64/freeimage/bin/win32/FreeImage.dll [moved from dependencies64/freeimage/bin/FreeImage.dll with 100% similarity]
dependencies64/freeimage/bin/win32/FreeImaged.dll [moved from dependencies64/freeimage/bin/FreeImaged.dll with 100% similarity]
dependencies64/freeimage/lib/linux/libfreeimage.so [new symlink]
dependencies64/freeimage/lib/linux/libfreeimage.so.3 [new file with mode: 0755]
dependencies64/freeimage/lib/win32/FreeImage.lib [moved from dependencies64/freeimage/lib/FreeImage.lib with 100% similarity]
dependencies64/freeimage/lib/win32/FreeImaged.lib [moved from dependencies64/freeimage/lib/FreeImaged.lib with 100% similarity]
dependencies64/sfml/lib/linux/libsfml-audio-s.a [new file with mode: 0644]
dependencies64/sfml/lib/linux/libsfml-graphics-s.a [new file with mode: 0644]
dependencies64/sfml/lib/linux/libsfml-network-s.a [new file with mode: 0644]
dependencies64/sfml/lib/linux/libsfml-system-s.a [new file with mode: 0644]
dependencies64/sfml/lib/linux/libsfml-window-s.a [new file with mode: 0644]
dependencies64/sfml/lib/win32/sfml-audio-2.lib [moved from dependencies64/sfml/lib/sfml-audio-2.lib with 100% similarity]
dependencies64/sfml/lib/win32/sfml-audio-d-2.lib [moved from dependencies64/sfml/lib/sfml-audio-d-2.lib with 100% similarity]
dependencies64/sfml/lib/win32/sfml-graphics-2.lib [moved from dependencies64/sfml/lib/sfml-graphics-2.lib with 100% similarity]
dependencies64/sfml/lib/win32/sfml-graphics-d-2.lib [moved from dependencies64/sfml/lib/sfml-graphics-d-2.lib with 100% similarity]
dependencies64/sfml/lib/win32/sfml-system-2.lib [moved from dependencies64/sfml/lib/sfml-system-2.lib with 100% similarity]
dependencies64/sfml/lib/win32/sfml-system-d-2.lib [moved from dependencies64/sfml/lib/sfml-system-d-2.lib with 100% similarity]
dependencies64/sfml/lib/win32/sfml-window-2.lib [moved from dependencies64/sfml/lib/sfml-window-2.lib with 100% similarity]
dependencies64/sfml/lib/win32/sfml-window-d-2.lib [moved from dependencies64/sfml/lib/sfml-window-d-2.lib with 100% similarity]
dependencies64/tbb/bin/linux [new symlink]
dependencies64/tbb/bin/win32/tbb.dll [moved from dependencies64/tbb/bin/tbb.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbb.pdb [moved from dependencies64/tbb/bin/tbb.pdb with 100% similarity]
dependencies64/tbb/bin/win32/tbb_debug.dll [moved from dependencies64/tbb/bin/tbb_debug.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbb_debug.pdb [moved from dependencies64/tbb/bin/tbb_debug.pdb with 100% similarity]
dependencies64/tbb/bin/win32/tbb_preview.dll [moved from dependencies64/tbb/bin/tbb_preview.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbb_preview.pdb [moved from dependencies64/tbb/bin/tbb_preview.pdb with 100% similarity]
dependencies64/tbb/bin/win32/tbb_preview_debug.dll [moved from dependencies64/tbb/bin/tbb_preview_debug.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbb_preview_debug.pdb [moved from dependencies64/tbb/bin/tbb_preview_debug.pdb with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc.dll [moved from dependencies64/tbb/bin/tbbmalloc.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc.pdb [moved from dependencies64/tbb/bin/tbbmalloc.pdb with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc_debug.dll [moved from dependencies64/tbb/bin/tbbmalloc_debug.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc_debug.pdb [moved from dependencies64/tbb/bin/tbbmalloc_debug.pdb with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc_proxy.dll [moved from dependencies64/tbb/bin/tbbmalloc_proxy.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc_proxy.pdb [moved from dependencies64/tbb/bin/tbbmalloc_proxy.pdb with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc_proxy_debug.dll [moved from dependencies64/tbb/bin/tbbmalloc_proxy_debug.dll with 100% similarity]
dependencies64/tbb/bin/win32/tbbmalloc_proxy_debug.pdb [moved from dependencies64/tbb/bin/tbbmalloc_proxy_debug.pdb with 100% similarity]
dependencies64/tbb/lib/linux/irml/libirml.so [new file with mode: 0755]
dependencies64/tbb/lib/linux/irml/libirml_debug.so [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbb.so [new symlink]
dependencies64/tbb/lib/linux/libtbb.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbb_debug.so [new symlink]
dependencies64/tbb/lib/linux/libtbb_debug.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbb_preview.so [new symlink]
dependencies64/tbb/lib/linux/libtbb_preview.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbb_preview_debug.so [new symlink]
dependencies64/tbb/lib/linux/libtbb_preview_debug.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbbmalloc.so [new symlink]
dependencies64/tbb/lib/linux/libtbbmalloc.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbbmalloc_debug.so [new symlink]
dependencies64/tbb/lib/linux/libtbbmalloc_debug.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbbmalloc_proxy.so [new symlink]
dependencies64/tbb/lib/linux/libtbbmalloc_proxy.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/linux/libtbbmalloc_proxy_debug.so [new symlink]
dependencies64/tbb/lib/linux/libtbbmalloc_proxy_debug.so.2 [new file with mode: 0755]
dependencies64/tbb/lib/win32/irml/irml.lib [moved from dependencies64/tbb/lib/irml/irml.lib with 100% similarity]
dependencies64/tbb/lib/win32/irml/irml_debug.lib [moved from dependencies64/tbb/lib/irml/irml_debug.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbb.def [moved from dependencies64/tbb/lib/tbb.def with 100% similarity]
dependencies64/tbb/lib/win32/tbb.lib [moved from dependencies64/tbb/lib/tbb.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbb_debug.lib [moved from dependencies64/tbb/lib/tbb_debug.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbb_preview.lib [moved from dependencies64/tbb/lib/tbb_preview.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbb_preview_debug.lib [moved from dependencies64/tbb/lib/tbb_preview_debug.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbbmalloc.def [moved from dependencies64/tbb/lib/tbbmalloc.def with 100% similarity]
dependencies64/tbb/lib/win32/tbbmalloc.lib [moved from dependencies64/tbb/lib/tbbmalloc.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbbmalloc_debug.lib [moved from dependencies64/tbb/lib/tbbmalloc_debug.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbbmalloc_proxy.lib [moved from dependencies64/tbb/lib/tbbmalloc_proxy.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbbmalloc_proxy_debug.lib [moved from dependencies64/tbb/lib/tbbmalloc_proxy_debug.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbbproxy.lib [moved from dependencies64/tbb/lib/tbbproxy.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbbproxy.pdb [moved from dependencies64/tbb/lib/tbbproxy.pdb with 100% similarity]
dependencies64/tbb/lib/win32/tbbproxy_debug.lib [moved from dependencies64/tbb/lib/tbbproxy_debug.lib with 100% similarity]
dependencies64/tbb/lib/win32/tbbproxy_debug.pdb [moved from dependencies64/tbb/lib/tbbproxy_debug.pdb with 100% similarity]
modules/image/util/image_algorithms.h
protocol/StdAfx.h
shell/CMakeLists.txt
shell/linux_specific.cpp
shell/server.cpp

index bb6d853ccb2ea500c230bb133258c7abf6600d5d..596ab5ce1453366e838fbd86554e812a1ef36501 100644 (file)
@@ -33,22 +33,28 @@ set(FREEIMAGE_INCLUDE_PATH          "${DEPENDENCIES_FOLDER}/freeimage/include")
 set(OPENAL_INCLUDE_PATH                        "${DEPENDENCIES_FOLDER}/openal/include")
 set(BLUEFISH_INCLUDE_PATH              "${DEPENDENCIES_FOLDER}/bluefish/include")
 
-set(FFMPEG_BIN_PATH                            "${DEPENDENCIES_FOLDER}/ffmpeg/bin")
-set(FREEIMAGE_BIN_PATH                 "${DEPENDENCIES_FOLDER}/freeimage/bin")
+if (MSVC)
+       set(PLATFORM_FOLDER_NAME        "win32")
+elseif (CMAKE_COMPILER_IS_GNUCXX)
+       set(PLATFORM_FOLDER_NAME        "linux")
+endif ()
+
+set(FFMPEG_BIN_PATH                            "${DEPENDENCIES_FOLDER}/ffmpeg/bin/${PLATFORM_FOLDER_NAME}")
+set(FREEIMAGE_BIN_PATH                 "${DEPENDENCIES_FOLDER}/freeimage/bin/${PLATFORM_FOLDER_NAME}")
 set(GLEW_BIN_PATH                              "${DEPENDENCIES_FOLDER}/glew/bin")
 set(OPENAL_BIN_PATH                            "${DEPENDENCIES_FOLDER}/openal/bin")
-set(TBB_BIN_PATH                               "${DEPENDENCIES_FOLDER}/tbb/bin")
+set(TBB_BIN_PATH                               "${DEPENDENCIES_FOLDER}/tbb/bin/${PLATFORM_FOLDER_NAME}")
 set(LIBERATION_FONTS_BIN_PATH  "${DEPENDENCIES_FOLDER}/liberation-fonts")
 
-link_directories("${DEPENDENCIES_FOLDER}/boost/stage/lib")
-link_directories("${DEPENDENCIES_FOLDER}/tbb/lib")
+link_directories("${DEPENDENCIES_FOLDER}/boost/stage/lib/${PLATFORM_FOLDER_NAME}")
+link_directories("${DEPENDENCIES_FOLDER}/tbb/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/glew/lib")
-link_directories("${DEPENDENCIES_FOLDER}/sfml/lib")
+link_directories("${DEPENDENCIES_FOLDER}/sfml/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/sfml/extlibs/lib")
 link_directories("${DEPENDENCIES_FOLDER}/freetype/objs/win32/vc2010")
-link_directories("${DEPENDENCIES_FOLDER}/ffmpeg/lib")
+link_directories("${DEPENDENCIES_FOLDER}/ffmpeg/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/asmlib")
-link_directories("${DEPENDENCIES_FOLDER}/freeimage/lib")
+link_directories("${DEPENDENCIES_FOLDER}/freeimage/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/openal/lib")
 link_directories("${DEPENDENCIES_FOLDER}/bluefish/lib")
 link_directories("${DEPENDENCIES_FOLDER}/zlib/lib")
@@ -65,12 +71,12 @@ if (MSVC)
        set(CMAKE_CXX_FLAGS                     "${CMAKE_CXX_FLAGS}                     /EHa /Zi /W4 /WX /MP /fp:fast /FIcommon/compiler/vs/disable_silly_warnings.h")
        set(CMAKE_CXX_FLAGS_DEBUG       "${CMAKE_CXX_FLAGS_DEBUG}       /D TBB_USE_ASSERT=1 /D TBB_USE_DEBUG /bigobj")
        set(CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE}     /Oi /Ot /Gy")
-
 elseif (CMAKE_COMPILER_IS_GNUCXX)
        add_compile_options( -std=c++11 )
        add_compile_options( -msse3 )
        add_compile_options( -mssse3 )
        add_compile_options( -msse4.1 )
+       add_compile_options( -pthread )
 endif ()
 
 cmake_policy(SET CMP0045 OLD)
index 5eb83b0a0709620e8b38a56159339e332e9fb339..fbfd50502f9f6b7c356470d078ac7313c478fb67 100644 (file)
@@ -32,6 +32,7 @@ if (MSVC)
        )
 elseif (CMAKE_COMPILER_IS_GNUCXX)
        set(OS_SPECIFIC_SOURCES
+                       os/linux/prec_timer.cpp
                        os/linux/signal_handlers.cpp
                        os/linux/scheduling.cpp
                        os/linux/stack_trace.cpp
diff --git a/common/os/linux/prec_timer.cpp b/common/os/linux/prec_timer.cpp
new file mode 100644 (file)
index 0000000..57f38ef
--- /dev/null
@@ -0,0 +1,77 @@
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#include "../../stdafx.h"
+
+#include "../../prec_timer.h"
+
+#include <boost/thread.hpp>
+#include <boost/chrono/system_clocks.hpp>
+
+using namespace boost::chrono;
+
+namespace caspar {
+       
+prec_timer::prec_timer()
+       : time_(0)
+{
+}
+
+void prec_timer::tick_millis(int64_t ticks_to_wait)
+{
+       auto t = duration_cast<milliseconds>(high_resolution_clock::now().time_since_epoch()).count();
+
+       if (time_ != 0)
+       {
+               bool done = 0;
+               do
+               {
+                       auto ticks_passed = t - time_;
+                       auto ticks_left = ticks_to_wait - ticks_passed;
+
+                       if (t < time_)    // time wrap
+                               done = 1;
+                       if (ticks_passed >= ticks_to_wait)
+                               done = 1;
+
+                       if (!done)
+                       {
+                               // if > 0.002s left, do Sleep(1), which will actually sleep some 
+                               //   steady amount, probably 1-2 ms,
+                               //   and do so in a nice way (cpu meter drops; laptop battery spared).
+                               // otherwise, do a few Sleep(0)'s, which just give up the timeslice,
+                               //   but don't really save cpu or battery, but do pass a tiny
+                               //   amount of time.
+                               if (ticks_left > 2)
+                                       boost::this_thread::sleep_for(milliseconds(1));
+                               /*else
+                                       for (int i = 0; i < 10; ++i)
+                                               Sleep(0);  // causes thread to give up its timeslice*/
+                       }
+
+                       t = duration_cast<milliseconds>(high_resolution_clock::now().time_since_epoch()).count();
+               } while (!done);
+       }
+
+       time_ = t;
+}
+
+}
index afe509fb85aabc9eb363ed8bb3a85f123e0448d2..06c324c8178daeeb3aacd94dd65289c1189b8aa3 100644 (file)
 
 namespace caspar { namespace core {
                
-std::vector<consumer_factory_t> g_factories;
-std::map<std::wstring, preconfigured_consumer_factory_t> g_preconfigured_factories;
+std::vector<consumer_factory_t> g_consumer_factories;
+std::map<std::wstring, preconfigured_consumer_factory_t> g_preconfigured_consumer_factories;
 
 void register_consumer_factory(const consumer_factory_t& factory)
 {
-       g_factories.push_back(factory);
+       g_consumer_factories.push_back(factory);
 }
 
 void register_preconfigured_consumer_factory(
                const std::wstring& element_name,
                const preconfigured_consumer_factory_t& factory)
 {
-       g_preconfigured_factories.insert(std::make_pair(element_name, factory));
+       g_preconfigured_consumer_factories.insert(std::make_pair(element_name, factory));
 }
 
 class destroy_consumer_proxy : public frame_consumer
@@ -237,7 +237,7 @@ spl::shared_ptr<core::frame_consumer> create_consumer(
                CASPAR_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));
        
        auto consumer = frame_consumer::empty();
-       std::any_of(g_factories.begin(), g_factories.end(), [&](const consumer_factory_t& factory) -> bool
+       std::any_of(g_consumer_factories.begin(), g_consumer_factories.end(), [&](const consumer_factory_t& factory) -> bool
                {
                        try
                        {
@@ -265,9 +265,9 @@ spl::shared_ptr<frame_consumer> create_consumer(
                const boost::property_tree::wptree& element,
                interaction_sink* sink)
 {
-       auto found = g_preconfigured_factories.find(element_name);
+       auto found = g_preconfigured_consumer_factories.find(element_name);
 
-       if (found == g_preconfigured_factories.end())
+       if (found == g_preconfigured_consumer_factories.end())
                CASPAR_THROW_EXCEPTION(file_not_found()
                        << msg_info(L"No consumer factory registered for element name " + element_name));
 
index 036dc1a4da306c2f36dca1724defedd3526cbba7..e5936e58404a0c7ea68d3bf072f4ba6d5aeae44f 100644 (file)
 
 namespace caspar { namespace core {
        
-std::vector<producer_factory_t> g_factories;
+std::vector<producer_factory_t> g_producer_factories;
 std::vector<producer_factory_t> g_thumbnail_factories;
 
 void register_producer_factory(const producer_factory_t& factory)
 {
-       g_factories.push_back(factory);
+       g_producer_factories.push_back(factory);
 }
 void register_thumbnail_producer_factory(const producer_factory_t& factory)
 {
@@ -326,7 +326,7 @@ spl::shared_ptr<core::frame_producer> create_thumbnail_producer(const spl::share
 
 spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<frame_factory>& my_frame_factory, const video_format_desc& format_desc, const std::vector<std::wstring>& params)
 {      
-       auto producer = do_create_producer(my_frame_factory, format_desc, params, g_factories);
+       auto producer = do_create_producer(my_frame_factory, format_desc, params, g_producer_factories);
        auto key_producer = frame_producer::empty();
        
        try // to find a key file.
@@ -335,11 +335,11 @@ spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<fram
                if(params_copy.size() > 0)
                {
                        params_copy[0] += L"_A";
-                       key_producer = do_create_producer(my_frame_factory, format_desc, params_copy, g_factories);                     
+                       key_producer = do_create_producer(my_frame_factory, format_desc, params_copy, g_producer_factories);
                        if(key_producer == frame_producer::empty())
                        {
                                params_copy[0] += L"LPHA";
-                               key_producer = do_create_producer(my_frame_factory, format_desc, params_copy, g_factories);     
+                               key_producer = do_create_producer(my_frame_factory, format_desc, params_copy, g_producer_factories);
                        }
                }
        }
index 40585db76b54a9b3ff1a4805fc529f276d5fe4d5..6250a13eb99e14897aefd4ce4024513ecceb9b7f 100644 (file)
@@ -385,12 +385,6 @@ op parse_operator(std::wstring::const_iterator& cursor, const std::wstring& str)
                        L"Unexpected end of input (Expected operator) in " + str));
 }
 
-template<typename T>
-T as(const boost::any& value)
-{
-       return boost::any_cast<T>(value);
-}
-
 boost::any as_binding(const boost::any& value)
 {
        // Wrap supported constants as bindings
@@ -731,7 +725,7 @@ boost::any parse_expression(
        return as_binding(tokens.at(0));
 }
 
-template<>
+/*template<>
 binding<std::wstring> parse_expression(
                const std::wstring& str, const variable_repository& var_repo)
 {
@@ -746,6 +740,6 @@ binding<std::wstring> parse_expression(
                CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(
                                L"parse_expression() Unsupported type "
                                + u16(expr.type().name())));
-}
+}*/
 
 }}}
index 0ef6e1a6c45deee679d79f343bc9c894a68c46ab..ec50a83e234442636a3a3f393ae5151ef0768121 100644 (file)
@@ -38,6 +38,12 @@ bool is(const boost::any& value)
        return value.type() == typeid(T);
 }
 
+template<typename T>
+T as(const boost::any& value)
+{
+       return boost::any_cast<T>(value);
+}
+
 template<typename T>
 static binding<T> parse_expression(
                const std::wstring& str, const variable_repository& var_repo)
@@ -55,6 +61,19 @@ static binding<T> parse_expression(
 
 template<>
 binding<std::wstring> parse_expression(
-               const std::wstring& str, const variable_repository& var_repo);
+               const std::wstring& str, const variable_repository& var_repo)
+{
+       auto cursor = str.cbegin();
+       auto expr = parse_expression(cursor, str, var_repo);
+
+       if (is<binding<std::wstring>>(expr))
+               return as<binding<std::wstring>>(expr);
+       else if (is<binding<double>>(expr))
+               return as<binding<double>>(expr).as<std::wstring>();
+       else
+               CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(
+                               L"parse_expression() Unsupported type "
+                               + u16(expr.type().name())));
+}
 
 }}}
diff --git a/dependencies64/boost/stage/lib/linux/libboost_atomic.a b/dependencies64/boost/stage/lib/linux/libboost_atomic.a
new file mode 100644 (file)
index 0000000..e80daec
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_atomic.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_chrono.a b/dependencies64/boost/stage/lib/linux/libboost_chrono.a
new file mode 100644 (file)
index 0000000..5ebf048
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_chrono.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_container.a b/dependencies64/boost/stage/lib/linux/libboost_container.a
new file mode 100644 (file)
index 0000000..52689a6
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_container.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_context.a b/dependencies64/boost/stage/lib/linux/libboost_context.a
new file mode 100644 (file)
index 0000000..03a2dad
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_context.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_coroutine.a b/dependencies64/boost/stage/lib/linux/libboost_coroutine.a
new file mode 100644 (file)
index 0000000..eb3f162
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_coroutine.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_date_time.a b/dependencies64/boost/stage/lib/linux/libboost_date_time.a
new file mode 100644 (file)
index 0000000..85041bd
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_date_time.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_exception.a b/dependencies64/boost/stage/lib/linux/libboost_exception.a
new file mode 100644 (file)
index 0000000..d2fa934
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_exception.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_filesystem.a b/dependencies64/boost/stage/lib/linux/libboost_filesystem.a
new file mode 100644 (file)
index 0000000..2089433
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_filesystem.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_graph.a b/dependencies64/boost/stage/lib/linux/libboost_graph.a
new file mode 100644 (file)
index 0000000..29afb25
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_graph.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_locale.a b/dependencies64/boost/stage/lib/linux/libboost_locale.a
new file mode 100644 (file)
index 0000000..20c3428
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_locale.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_log.a b/dependencies64/boost/stage/lib/linux/libboost_log.a
new file mode 100644 (file)
index 0000000..a20187b
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_log.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_log_setup.a b/dependencies64/boost/stage/lib/linux/libboost_log_setup.a
new file mode 100644 (file)
index 0000000..0974ad5
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_log_setup.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_math_c99.a b/dependencies64/boost/stage/lib/linux/libboost_math_c99.a
new file mode 100644 (file)
index 0000000..01dca4c
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_math_c99.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_math_c99f.a b/dependencies64/boost/stage/lib/linux/libboost_math_c99f.a
new file mode 100644 (file)
index 0000000..5b1b0fc
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_math_c99f.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_math_c99l.a b/dependencies64/boost/stage/lib/linux/libboost_math_c99l.a
new file mode 100644 (file)
index 0000000..b372d24
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_math_c99l.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_math_tr1.a b/dependencies64/boost/stage/lib/linux/libboost_math_tr1.a
new file mode 100644 (file)
index 0000000..eb893f1
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_math_tr1.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_math_tr1f.a b/dependencies64/boost/stage/lib/linux/libboost_math_tr1f.a
new file mode 100644 (file)
index 0000000..36c9d32
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_math_tr1f.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_math_tr1l.a b/dependencies64/boost/stage/lib/linux/libboost_math_tr1l.a
new file mode 100644 (file)
index 0000000..47249a5
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_math_tr1l.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_prg_exec_monitor.a b/dependencies64/boost/stage/lib/linux/libboost_prg_exec_monitor.a
new file mode 100644 (file)
index 0000000..ba0a7c7
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_prg_exec_monitor.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_program_options.a b/dependencies64/boost/stage/lib/linux/libboost_program_options.a
new file mode 100644 (file)
index 0000000..d9f9aa9
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_program_options.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_python.a b/dependencies64/boost/stage/lib/linux/libboost_python.a
new file mode 100644 (file)
index 0000000..537545a
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_python.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_random.a b/dependencies64/boost/stage/lib/linux/libboost_random.a
new file mode 100644 (file)
index 0000000..8fe1e36
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_random.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_regex.a b/dependencies64/boost/stage/lib/linux/libboost_regex.a
new file mode 100644 (file)
index 0000000..5b46062
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_regex.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_serialization.a b/dependencies64/boost/stage/lib/linux/libboost_serialization.a
new file mode 100644 (file)
index 0000000..0148148
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_serialization.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_signals.a b/dependencies64/boost/stage/lib/linux/libboost_signals.a
new file mode 100644 (file)
index 0000000..4289a07
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_signals.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_system.a b/dependencies64/boost/stage/lib/linux/libboost_system.a
new file mode 100644 (file)
index 0000000..dad3a6f
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_system.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_test_exec_monitor.a b/dependencies64/boost/stage/lib/linux/libboost_test_exec_monitor.a
new file mode 100644 (file)
index 0000000..bb9b676
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_test_exec_monitor.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_thread.a b/dependencies64/boost/stage/lib/linux/libboost_thread.a
new file mode 100644 (file)
index 0000000..c80238d
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_thread.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_timer.a b/dependencies64/boost/stage/lib/linux/libboost_timer.a
new file mode 100644 (file)
index 0000000..6e38e86
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_timer.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_unit_test_framework.a b/dependencies64/boost/stage/lib/linux/libboost_unit_test_framework.a
new file mode 100644 (file)
index 0000000..4b77b59
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_unit_test_framework.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_wave.a b/dependencies64/boost/stage/lib/linux/libboost_wave.a
new file mode 100644 (file)
index 0000000..c9c0bcc
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_wave.a differ
diff --git a/dependencies64/boost/stage/lib/linux/libboost_wserialization.a b/dependencies64/boost/stage/lib/linux/libboost_wserialization.a
new file mode 100644 (file)
index 0000000..82c58d1
Binary files /dev/null and b/dependencies64/boost/stage/lib/linux/libboost_wserialization.a differ
diff --git a/dependencies64/ffmpeg/bin/linux/libavcodec.so b/dependencies64/ffmpeg/bin/linux/libavcodec.so
new file mode 120000 (symlink)
index 0000000..0889398
--- /dev/null
@@ -0,0 +1 @@
+libavcodec.so.55
\ No newline at end of file
diff --git a/dependencies64/ffmpeg/bin/linux/libavcodec.so.55 b/dependencies64/ffmpeg/bin/linux/libavcodec.so.55
new file mode 100755 (executable)
index 0000000..231ae15
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libavcodec.so.55 differ
diff --git a/dependencies64/ffmpeg/bin/linux/libavdevice.so b/dependencies64/ffmpeg/bin/linux/libavdevice.so
new file mode 100755 (executable)
index 0000000..14755ff
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libavdevice.so differ
diff --git a/dependencies64/ffmpeg/bin/linux/libavfilter.so b/dependencies64/ffmpeg/bin/linux/libavfilter.so
new file mode 120000 (symlink)
index 0000000..0d49820
--- /dev/null
@@ -0,0 +1 @@
+libavfilter.so.4
\ No newline at end of file
diff --git a/dependencies64/ffmpeg/bin/linux/libavfilter.so.4 b/dependencies64/ffmpeg/bin/linux/libavfilter.so.4
new file mode 100755 (executable)
index 0000000..a3c5018
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libavfilter.so.4 differ
diff --git a/dependencies64/ffmpeg/bin/linux/libavformat.so b/dependencies64/ffmpeg/bin/linux/libavformat.so
new file mode 120000 (symlink)
index 0000000..d57f58a
--- /dev/null
@@ -0,0 +1 @@
+libavformat.so.55
\ No newline at end of file
diff --git a/dependencies64/ffmpeg/bin/linux/libavformat.so.55 b/dependencies64/ffmpeg/bin/linux/libavformat.so.55
new file mode 100755 (executable)
index 0000000..0c66209
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libavformat.so.55 differ
diff --git a/dependencies64/ffmpeg/bin/linux/libavutil.so b/dependencies64/ffmpeg/bin/linux/libavutil.so
new file mode 120000 (symlink)
index 0000000..27ec8ec
--- /dev/null
@@ -0,0 +1 @@
+libavutil.so.52
\ No newline at end of file
diff --git a/dependencies64/ffmpeg/bin/linux/libavutil.so.52 b/dependencies64/ffmpeg/bin/linux/libavutil.so.52
new file mode 100755 (executable)
index 0000000..c8413ef
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libavutil.so.52 differ
diff --git a/dependencies64/ffmpeg/bin/linux/libpostproc.so b/dependencies64/ffmpeg/bin/linux/libpostproc.so
new file mode 100755 (executable)
index 0000000..e4d7f22
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libpostproc.so differ
diff --git a/dependencies64/ffmpeg/bin/linux/libswresample.so b/dependencies64/ffmpeg/bin/linux/libswresample.so
new file mode 120000 (symlink)
index 0000000..e47be6d
--- /dev/null
@@ -0,0 +1 @@
+libswresample.so.0
\ No newline at end of file
diff --git a/dependencies64/ffmpeg/bin/linux/libswresample.so.0 b/dependencies64/ffmpeg/bin/linux/libswresample.so.0
new file mode 100755 (executable)
index 0000000..0526862
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libswresample.so.0 differ
diff --git a/dependencies64/ffmpeg/bin/linux/libswscale.so b/dependencies64/ffmpeg/bin/linux/libswscale.so
new file mode 120000 (symlink)
index 0000000..1779741
--- /dev/null
@@ -0,0 +1 @@
+libswscale.so.2
\ No newline at end of file
diff --git a/dependencies64/ffmpeg/bin/linux/libswscale.so.2 b/dependencies64/ffmpeg/bin/linux/libswscale.so.2
new file mode 100755 (executable)
index 0000000..a237f02
Binary files /dev/null and b/dependencies64/ffmpeg/bin/linux/libswscale.so.2 differ
diff --git a/dependencies64/ffmpeg/lib/linux b/dependencies64/ffmpeg/lib/linux
new file mode 120000 (symlink)
index 0000000..45da3e6
--- /dev/null
@@ -0,0 +1 @@
+../bin/linux
\ No newline at end of file
diff --git a/dependencies64/freeimage/bin/linux b/dependencies64/freeimage/bin/linux
new file mode 120000 (symlink)
index 0000000..5f3435a
--- /dev/null
@@ -0,0 +1 @@
+../lib/linux
\ No newline at end of file
diff --git a/dependencies64/freeimage/lib/linux/libfreeimage.so b/dependencies64/freeimage/lib/linux/libfreeimage.so
new file mode 120000 (symlink)
index 0000000..9a46e1e
--- /dev/null
@@ -0,0 +1 @@
+libfreeimage.so.3
\ No newline at end of file
diff --git a/dependencies64/freeimage/lib/linux/libfreeimage.so.3 b/dependencies64/freeimage/lib/linux/libfreeimage.so.3
new file mode 100755 (executable)
index 0000000..9b3a8db
Binary files /dev/null and b/dependencies64/freeimage/lib/linux/libfreeimage.so.3 differ
diff --git a/dependencies64/sfml/lib/linux/libsfml-audio-s.a b/dependencies64/sfml/lib/linux/libsfml-audio-s.a
new file mode 100644 (file)
index 0000000..1530674
Binary files /dev/null and b/dependencies64/sfml/lib/linux/libsfml-audio-s.a differ
diff --git a/dependencies64/sfml/lib/linux/libsfml-graphics-s.a b/dependencies64/sfml/lib/linux/libsfml-graphics-s.a
new file mode 100644 (file)
index 0000000..5db7a13
Binary files /dev/null and b/dependencies64/sfml/lib/linux/libsfml-graphics-s.a differ
diff --git a/dependencies64/sfml/lib/linux/libsfml-network-s.a b/dependencies64/sfml/lib/linux/libsfml-network-s.a
new file mode 100644 (file)
index 0000000..db7dee0
Binary files /dev/null and b/dependencies64/sfml/lib/linux/libsfml-network-s.a differ
diff --git a/dependencies64/sfml/lib/linux/libsfml-system-s.a b/dependencies64/sfml/lib/linux/libsfml-system-s.a
new file mode 100644 (file)
index 0000000..c55d41f
Binary files /dev/null and b/dependencies64/sfml/lib/linux/libsfml-system-s.a differ
diff --git a/dependencies64/sfml/lib/linux/libsfml-window-s.a b/dependencies64/sfml/lib/linux/libsfml-window-s.a
new file mode 100644 (file)
index 0000000..e18f76e
Binary files /dev/null and b/dependencies64/sfml/lib/linux/libsfml-window-s.a differ
diff --git a/dependencies64/tbb/bin/linux b/dependencies64/tbb/bin/linux
new file mode 120000 (symlink)
index 0000000..5f3435a
--- /dev/null
@@ -0,0 +1 @@
+../lib/linux
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/irml/libirml.so b/dependencies64/tbb/lib/linux/irml/libirml.so
new file mode 100755 (executable)
index 0000000..adcff6d
Binary files /dev/null and b/dependencies64/tbb/lib/linux/irml/libirml.so differ
diff --git a/dependencies64/tbb/lib/linux/irml/libirml_debug.so b/dependencies64/tbb/lib/linux/irml/libirml_debug.so
new file mode 100755 (executable)
index 0000000..2be6b83
Binary files /dev/null and b/dependencies64/tbb/lib/linux/irml/libirml_debug.so differ
diff --git a/dependencies64/tbb/lib/linux/libtbb.so b/dependencies64/tbb/lib/linux/libtbb.so
new file mode 120000 (symlink)
index 0000000..8c6f6be
--- /dev/null
@@ -0,0 +1 @@
+libtbb.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbb.so.2 b/dependencies64/tbb/lib/linux/libtbb.so.2
new file mode 100755 (executable)
index 0000000..07d94b3
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbb.so.2 differ
diff --git a/dependencies64/tbb/lib/linux/libtbb_debug.so b/dependencies64/tbb/lib/linux/libtbb_debug.so
new file mode 120000 (symlink)
index 0000000..941a060
--- /dev/null
@@ -0,0 +1 @@
+libtbb_debug.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbb_debug.so.2 b/dependencies64/tbb/lib/linux/libtbb_debug.so.2
new file mode 100755 (executable)
index 0000000..afb3ae9
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbb_debug.so.2 differ
diff --git a/dependencies64/tbb/lib/linux/libtbb_preview.so b/dependencies64/tbb/lib/linux/libtbb_preview.so
new file mode 120000 (symlink)
index 0000000..4e2837b
--- /dev/null
@@ -0,0 +1 @@
+libtbb_preview.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbb_preview.so.2 b/dependencies64/tbb/lib/linux/libtbb_preview.so.2
new file mode 100755 (executable)
index 0000000..61b509a
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbb_preview.so.2 differ
diff --git a/dependencies64/tbb/lib/linux/libtbb_preview_debug.so b/dependencies64/tbb/lib/linux/libtbb_preview_debug.so
new file mode 120000 (symlink)
index 0000000..a1417ea
--- /dev/null
@@ -0,0 +1 @@
+libtbb_preview_debug.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbb_preview_debug.so.2 b/dependencies64/tbb/lib/linux/libtbb_preview_debug.so.2
new file mode 100755 (executable)
index 0000000..c4177ba
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbb_preview_debug.so.2 differ
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc.so b/dependencies64/tbb/lib/linux/libtbbmalloc.so
new file mode 120000 (symlink)
index 0000000..5be5f2d
--- /dev/null
@@ -0,0 +1 @@
+libtbbmalloc.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc.so.2 b/dependencies64/tbb/lib/linux/libtbbmalloc.so.2
new file mode 100755 (executable)
index 0000000..237aa4d
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbbmalloc.so.2 differ
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc_debug.so b/dependencies64/tbb/lib/linux/libtbbmalloc_debug.so
new file mode 120000 (symlink)
index 0000000..b3d49e2
--- /dev/null
@@ -0,0 +1 @@
+libtbbmalloc_debug.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc_debug.so.2 b/dependencies64/tbb/lib/linux/libtbbmalloc_debug.so.2
new file mode 100755 (executable)
index 0000000..5d29859
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbbmalloc_debug.so.2 differ
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc_proxy.so b/dependencies64/tbb/lib/linux/libtbbmalloc_proxy.so
new file mode 120000 (symlink)
index 0000000..d8a21b3
--- /dev/null
@@ -0,0 +1 @@
+libtbbmalloc_proxy.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc_proxy.so.2 b/dependencies64/tbb/lib/linux/libtbbmalloc_proxy.so.2
new file mode 100755 (executable)
index 0000000..2c5784e
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbbmalloc_proxy.so.2 differ
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc_proxy_debug.so b/dependencies64/tbb/lib/linux/libtbbmalloc_proxy_debug.so
new file mode 120000 (symlink)
index 0000000..9b5c361
--- /dev/null
@@ -0,0 +1 @@
+libtbbmalloc_proxy_debug.so.2
\ No newline at end of file
diff --git a/dependencies64/tbb/lib/linux/libtbbmalloc_proxy_debug.so.2 b/dependencies64/tbb/lib/linux/libtbbmalloc_proxy_debug.so.2
new file mode 100755 (executable)
index 0000000..915b2bf
Binary files /dev/null and b/dependencies64/tbb/lib/linux/libtbbmalloc_proxy_debug.so.2 differ
index f8c23f3d692ce581635d387d1789ec355557055d..929eb17346dadf9900f122ce239b868cd710d330 100644 (file)
@@ -25,6 +25,7 @@
 
 #include <cmath>
 #include <cstdint>
+#include <algorithm>
 
 namespace caspar { namespace image {
 
@@ -186,7 +187,7 @@ void blur(
 template<class SrcDstView>
 void premultiply(SrcDstView& view_to_modify)
 {
-       std::for_each(view_to_modify.begin(), view_to_modify.end(), [&](SrcDstView::pixel_type& pixel)
+       std::for_each(view_to_modify.begin(), view_to_modify.end(), [&](typename SrcDstView::pixel_type& pixel)
        {
                int alpha = static_cast<int>(pixel.a());
 
index 8b09ded289d952097cbb2a2692edc43a8ed7a510..bc9586c93be336edb9c4ea79cbe3cd7437c53996 100644 (file)
 #include <boost/filesystem.hpp>
 #include <boost/range/algorithm.hpp>
 
-#include "../common/utf.h"
-#include "../common/memory.h"
+#include <common/utf.h>
+#include <common/memory.h>
 //#include "../common/executor.h" // Can't include this due to MSVC lambda bug
 
-#include "../common/log.h"
-#include "../common/except.h"
+#include <common/log.h>
+#include <common/except.h>
 
 #include <assert.h>
index 1cec0693dab04d63204884f836225085cda1d346..3c56c0cf8e89bf4d0fc1abc3b152e65b07ed636b 100644 (file)
@@ -39,15 +39,8 @@ include_directories(${TBB_INCLUDE_PATH})
 
 source_group(sources ./*)
 
-target_link_libraries(casparcg
-               accelerator
-               common
-               core
-               protocol
-
-               "${CASPARCG_MODULE_PROJECTS}"
-               reroute
-
+if (MSVC)
+       set(LIBRARIES_TO_LINK
                alibcof64.lib
                jpeg.lib
                sndfile.lib
@@ -74,6 +67,55 @@ target_link_libraries(casparcg
                debug FreeImaged.lib
                freetype.lib
                zlibstat.lib
+       )
+else ()
+       set(LIBRARIES_TO_LINK
+               "${DEPENDENCIES_FOLDER}/asmlib/alibelf64.a"
+               avformat
+               avcodec
+               avutil
+               avfilter
+               swscale
+               swresample
+               freetype
+               freeimage
+               boost_system
+               boost_thread
+               boost_chrono
+               boost_filesystem
+               boost_log
+               boost_locale
+               boost_regex
+               boost_date_time
+               tbb
+               tbbmalloc
+               tbbmalloc_proxy
+               sfml-system-s
+               sfml-window-s
+               sfml-graphics-s
+               GLEW
+               GL
+               X11
+               jpeg
+               sndfile
+               freetype
+               udev
+               Xrandr
+               pthread
+       )
+endif ()
+
+target_link_libraries(casparcg
+               accelerator
+               common
+               core
+               protocol
+
+               "${CASPARCG_MODULE_PROJECTS}"
+
+               reroute
+
+               "${LIBRARIES_TO_LINK}"
 )
 
 set(OUTPUT_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
index c50123dc5f34fdbb28c353fb80d02432f0fdbc02..adc5aa4cd84cb70b74638a6b68e1897d5d93729e 100644 (file)
@@ -27,30 +27,33 @@ namespace caspar {
 
 void setup_prerequisites()
 {
-
+       // TODO: implement if needed.
 }
 
 void setup_console_window()
 {
-
+       // TODO: implement.
 }
 
 void increase_process_priority()
 {
+       // TODO: implement.
 }
 
 void wait_for_keypress()
 {
+       // TODO: implement if desirable.
 }
 
 std::shared_ptr<void> setup_debugging_environment()
 {
+       // TODO: implement if applicable.
        return nullptr;
 }
 
 void wait_for_remote_debugging()
 {
-
+       // TODO: implement if applicable.
 }
 
 }
index 394adda0bf24167da043d6a9a8d664dd9e1c1207..a7fd081bc068d867ad1b2ec8876f243462bbca05 100644 (file)
@@ -148,7 +148,7 @@ struct server::impl : boost::noncopyable
                async_servers_.clear();
                channels_.clear();
 
-               boost::this_thread::sleep(boost::posix_time::milliseconds(500));
+               boost::this_thread::sleep_for(boost::chrono::milliseconds(500));
                //Sleep(500); // HACK: Wait for asynchronous destruction of producers and consumers.
 
                uninitialize_modules();