[version.tmpl] Changed tag to Beta 1

[casparcg] / core / StdAfx.h

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 6c72569612c3a2d2b25ce5e64f0c398f13c70bfa..2173fffd7e3dfc8c81faada327054c08ad099991 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -1,66 +1,65 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
- \r
-// stdafx.h : include file for standard system include files,\r
-//  or project specific include files that are used frequently, but\r
-//      are changed infrequently\r
-//\r
-\r
-#pragma once\r
-\r
-#ifdef _DEBUG\r
-#include <crtdbg.h>\r
-#endif\r
-\r
-#define NOMINMAX\r
-\r
-#include <GL/glew.h>\r
-\r
-#include <algorithm>\r
-#include <array>\r
-#include <functional>\r
-#include <deque>\r
-#include <map>\r
-#include <memory>\r
-#include <queue>\r
-#include <string>\r
-#include <vector>\r
-\r
-#include <tbb/atomic.h>\r
-#include <tbb/concurrent_queue.h>\r
-#include <tbb/concurrent_unordered_map.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 <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
-#include <common/utility/assert.h>\r
+/*
+* 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>