X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Fstdafx.h;h=0b0445d1051aaf61fdaf21ec0e67511842cc380b;hb=7e7ef09558efdd89c3168017592978e90531f76d;hp=593184a4831f8e27aa2fc336928dca2b50e02d3e;hpb=d05fa92305a6781af12c76f7487e1d3a163c472c;p=casparcg

diff --git a/common/stdafx.h b/common/stdafx.h
index 593184a48..0b0445d10 100644
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -1,34 +1,26 @@
-/*
-* 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
-
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
-
-#include "compiler\vs\disable_silly_warnings.h"
-
-#include <string>
-#include <cassert>
+/*
+* 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
+
+#ifdef WIN32
+#include "os/windows/windows.h"
+#endif