Move common win32 version/inclusion defines into a new header

7 files changed, 38 insertions, 24 deletions

diff --git a/common/DSUtilLite/stdafx.h b/common/DSUtilLite/stdafx.h
index 6806cbed..b29a3fe5 100644
--- a/common/DSUtilLite/stdafx.h
+++ b/common/DSUtilLite/stdafx.h
@@ -19,9 +19,7 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-
+#include "common_defines.h"
 #include "version.h"
 
 #include <Windows.h>
diff --git a/common/includes/common_defines.h b/common/includes/common_defines.h
new file mode 100644
index 00000000..d03d0dfa
--- /dev/null
+++ b/common/includes/common_defines.h
@@ -0,0 +1,33 @@
+/*
+ *      Copyright (C) 2010-2015 Hendrik Leppkes
+ *      http://www.1f0.de
+ *
+ *  This program 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 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#pragma once
+
+// Set minimal target OS (XP SP2+)
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0502
+#ifdef WINVER
+#undef WINVER
+#endif
+#define WINVER _WIN32_WINNT
+
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
diff --git a/common/includes/version.h b/common/includes/version.h
index 32a85d22..02a96375 100644
--- a/common/includes/version.h
+++ b/common/includes/version.h
@@ -13,16 +13,6 @@
 /////////////////////////////////////////////////////////
 #ifndef ISPP_INCLUDED
 
-// Set XP as the minimal targeted OS
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0502
-#ifdef WINVER
-#undef WINVER
-#endif
-#define WINVER _WIN32_WINNT
-
 #define DO_MAKE_STR(x) #x
 #define MAKE_STR(x) DO_MAKE_STR(x)
 
diff --git a/decoder/LAVAudio/stdafx.h b/decoder/LAVAudio/stdafx.h
index 9c6579fc..939c3f34 100644
--- a/decoder/LAVAudio/stdafx.h
+++ b/decoder/LAVAudio/stdafx.h
@@ -21,12 +21,10 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-
 // Support for Version 6.0 styles
 #pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 
+#include "common_defines.h"
 #include "version.h"
 
 // include headers
diff --git a/decoder/LAVVideo/stdafx.h b/decoder/LAVVideo/stdafx.h
index ec2cb822..80a23dcb 100644
--- a/decoder/LAVVideo/stdafx.h
+++ b/decoder/LAVVideo/stdafx.h
@@ -21,12 +21,10 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-
 // Support for Version 6.0 styles
 #pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 
+#include "common_defines.h"
 #include "version.h"
 
 // include headers
diff --git a/demuxer/Demuxers/stdafx.h b/demuxer/Demuxers/stdafx.h
index b6ca41d0..5ca45dae 100644
--- a/demuxer/Demuxers/stdafx.h
+++ b/demuxer/Demuxers/stdafx.h
@@ -19,8 +19,7 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-#define VC_EXTRALEAN
+#include "common_defines.h"
 
 #include <atlbase.h>
 #include <atlconv.h>
diff --git a/demuxer/LAVSplitter/stdafx.h b/demuxer/LAVSplitter/stdafx.h
index 99c20201..e8e1310f 100644
--- a/demuxer/LAVSplitter/stdafx.h
+++ b/demuxer/LAVSplitter/stdafx.h
@@ -21,12 +21,10 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-
 // Support for Version 6.0 styles
 #pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 
+#include "common_defines.h"
 #include "version.h"
 
 // include headers