[ffmpeg] Ported 2.0.7 ffmpeg producer to 2.1.0 while still keeping the usage of the...

[casparcg] / modules / CMakeLists.txt

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index cd93e20b13156ff86af50bd8727aade24224895c..8dd4a84209b59da78955e588df63cb5f3c7294b2 100644 (file)
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,12 +1,23 @@
 cmake_minimum_required (VERSION 2.6)
 project ("modules")
 
-add_subdirectory(bluefish)
-add_subdirectory(decklink)
+add_subdirectory(reroute)
 add_subdirectory(ffmpeg)
-add_subdirectory(flash)
-add_subdirectory(image)
 add_subdirectory(oal)
-add_subdirectory(psd)
-add_subdirectory(reroute)
+
+if (MSVC)
+       add_subdirectory(bluefish)
+endif ()
+
+add_subdirectory(decklink)
 add_subdirectory(screen)
+add_subdirectory(html)
+add_subdirectory(psd)
+
+if (MSVC)
+       add_subdirectory(flash)
+       add_subdirectory(newtek)
+endif ()
+
+add_subdirectory(image)
+