git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / core / StdAfx.h

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 78566bcfabdc86cd4289a84a90188354f34e730a..6c72569612c3a2d2b25ce5e64f0c398f13c70bfa 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -25,53 +25,42 @@
 \r
 #pragma once\r
 \r
-#include "../common/compiler/vs/disable_silly_warnings.h"\r
-\r
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)\r
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
 \r
-#include "config.h"\r
-                \r
-#include <winsock2.h>\r
-#include <tchar.h>\r
-#include <sstream>\r
-#include <memory>\r
-#include <functional>\r
+#define NOMINMAX\r
+\r
+#include <GL/glew.h>\r
+\r
 #include <algorithm>\r
-#include <vector>\r
+#include <array>\r
+#include <functional>\r
 #include <deque>\r
+#include <map>\r
+#include <memory>\r
 #include <queue>\r
 #include <string>\r
-#include <math.h>\r
+#include <vector>\r
 \r
 #include <tbb/atomic.h>\r
 #include <tbb/concurrent_queue.h>\r
 #include <tbb/concurrent_unordered_map.h>\r
-#include <tbb/parallel_invoke.h>\r
-#include <tbb/parallel_for.h>\r
-#include <tbb/parallel_for_each.h>\r
 \r
 #include <boost/assign.hpp>\r
+#include <boost/circular_buffer.hpp>\r
+#include <boost/timer.hpp>\r
 #include <boost/filesystem.hpp>\r
 #include <boost/foreach.hpp>\r
+#include <boost/range.hpp>\r
+#include <boost/range/adaptors.hpp>\r
 #include <boost/range/algorithm.hpp>\r
 \r
-#include <GLee.h>\r
-\r
-#include <SFML/Window.hpp>\r
-#include <SFML/Audio.hpp>\r
-\r
-#include "../common/utility/string_convert.h"\r
-#include "../common/utility/safe_ptr.h"\r
+#include <common/utility/string.h>\r
+#include <common/memory/safe_ptr.h>\r
+//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
-#include "../common/log/Log.h"\r
-#include "../common/exception/exceptions.h"\r
-#include "../common/exception/win32_exception.h"\r
-\r
-#include <assert.h>\r
-\r
-#endif\r
+#include <common/log/log.h>\r
+#include <common/exception/exceptions.h>\r
+#include <common/exception/win32_exception.h>\r
+#include <common/utility/assert.h>\r