X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2FStdAfx.h;h=92f9c398fb8cf74a0f8437c039e75c1c7e15329a;hb=d04df8c32d56d0a5f6618e29a6118264957831ed;hp=39d599016d46a296120fcb737385bd4af56f06ea;hpb=d8ed3662c64972e0b179d04a5f06291f7324f3ee;p=casparcg

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 39d599016..92f9c398f 100644
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -1,87 +1,65 @@
 /*
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
 *
-*  This file is part of CasparCG.
+* 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 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/>.
+* 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
 */
- 
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
 
 #pragma once
 
-#include "../common/compiler/vs/disable_silly_warnings.h"
-
-#define NOMINMAX
-
-#if defined(_MSC_VER)
-#	ifndef _SCL_SECURE_NO_WARNINGS
-#		define _SCL_SECURE_NO_WARNINGS
-#	endif
-#	ifndef _CRT_SECURE_NO_WARNINGS
-#		define _CRT_SECURE_NO_WARNINGS
-#	endif
-#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 <winsock2.h>
-#include <tchar.h>
-#include <sstream>
-#include <memory>
-#include <functional>
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+
+#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/concurrent_unordered_map.h>
-#include <tbb/parallel_invoke.h>
-#include <tbb/parallel_for.h>
-#include <tbb/parallel_for_each.h>
 
 #include <boost/assign.hpp>
+#include <boost/circular_buffer.hpp>
+#include <boost/timer.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
+#include <boost/range.hpp>
+#include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm.hpp>
+#include <boost/thread.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/xml_parser.hpp>
 
-#include <GLee.h>
-
-#include <SFML/Window.hpp>
-#include <SFML/Audio.hpp>
-
-#include "../common/utility/string_convert.h"
-#include "../common/memory/safe_ptr.h"
+#include <common/assert.h>
+#include <common/utf.h>
+#include <common/spl/memory.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.h>
+#include <common/except.h>