X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2FStdAfx.h;h=2173fffd7e3dfc8c81faada327054c08ad099991;hb=5422850939eee2b223eff6a0274c5d3c1fbe68bb;hp=a2fb9e35c9a7b5029e4e05d8248a1bb6c870238a;hpb=d055b46c17b3b39b4fd2c36e99fb5b0fde128872;p=casparcg

diff --git a/core/StdAfx.h b/core/StdAfx.h
index a2fb9e35c..2173fffd7 100644
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -1,69 +1,65 @@
-/*
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
-*
-*  This file is part of CasparCG.
-*
-*    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/>.
-*
-*/
- 
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#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>
-#include <algorithm>
-#include <vector>
-#include <deque>
-#include <queue>
-#include <string>
-#include <math.h>
-
-#include <tbb/atomic.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/parallel_invoke.h>
-
-#include <boost/assign.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
-
-#include "../common/utility/string_convert.h"
-
-#include "../common/log/Log.h"
-#include "../common/exception/exceptions.h"
-#include "../common/exception/win32_exception.h"
-
-#include <assert.h>
-
-#endif
+/*
+* 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
+*/
+
+#pragma once
+
+#if defined _DEBUG && defined _MSC_VER
+#include <crtdbg.h>
+#endif
+
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+
+#include <GL/glew.h>
+
+#include <algorithm>
+#include <array>
+#include <functional>
+#include <deque>
+#include <map>
+#include <memory>
+#include <queue>
+#include <string>
+#include <vector>
+#include <set>
+
+#include <tbb/atomic.h>
+#include <tbb/concurrent_queue.h>
+#include <tbb/concurrent_unordered_map.h>
+
+#include <boost/circular_buffer.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/range.hpp>
+#include <boost/range/adaptors.hpp>
+#include <boost/range/algorithm.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/thread.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/xml_parser.hpp>
+
+#include <common/assert.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/timer.h>