Revert to original code as per master branch. I should have never made changes to...

[casparcg] / modules / CMakeLists.txt

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