X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2FStdAfx.h;h=2cd385119b51193e9923ce08f9d6d4804d6f8d70;hb=c4647c09f2092df9a71635d5866da89dce3a4fef;hp=6d60e3a41e73a6384dee4e57bc37b88fae9ccd79;hpb=3409cb96892b46462ecadb18036264ea4d162d85;p=casparcg

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 6d60e3a41..2cd385119 100644
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -25,45 +25,38 @@
 
 #pragma once
 
-#ifdef _MSC_VER
-#pragma warning (disable : 4482)
-#endif
-
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
-
 #ifdef _DEBUG
 #include <crtdbg.h>
 #endif
 
-#include "config.h"
-	 	 
-#include <winsock2.h>
-#include <tchar.h>
-#include <sstream>
-#include <memory>
-#include <functional>
+#define NOMINMAX
+
+#include <GL/glew.h>
+
 #include <algorithm>
-#include <vector>
+#include <array>
+#include <functional>
 #include <deque>
+#include <map>
+#include <memory>
 #include <queue>
 #include <string>
-#include <math.h>
+#include <vector>
 
 #include <tbb/atomic.h>
 #include <tbb/concurrent_queue.h>
-#include <tbb/parallel_invoke.h>
+#include <tbb/concurrent_unordered_map.h>
 
 #include <boost/assign.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
+#include <boost/range/algorithm.hpp>
 
-#include "../common/utility/string_convert.h"
+#include <common/utility/string.h>
+#include <common/memory/safe_ptr.h>
+//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug
 
-#include "../common/log/Log.h"
-#include "../common/exception/exceptions.h"
-#include "../common/exception/win32_exception.h"
-
-#include <assert.h>
-
-#endif
+#include <common/log/log.h>
+#include <common/exception/exceptions.h>
+#include <common/exception/win32_exception.h>
+#include <common/utility/assert.h>