diff --git a/common/include/PS2Eext.h b/common/include/PS2Eext.h index 2442866e7d..a5f607ae98 100644 --- a/common/include/PS2Eext.h +++ b/common/include/PS2Eext.h @@ -21,6 +21,9 @@ #include #if defined(_MSC_VER) +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#endif #include #include #include diff --git a/common/include/Utilities/RedtapeWindows.h b/common/include/Utilities/RedtapeWindows.h index 4a686052ba..6850e9156e 100644 --- a/common/include/Utilities/RedtapeWindows.h +++ b/common/include/Utilities/RedtapeWindows.h @@ -31,14 +31,13 @@ #ifdef _WIN32 -// Force availability of to WinNT APIs (change to 0x600 to disable XP-specific APIs) -#ifndef WINVER -#define WINVER 0x0501 -#define _WIN32_WINNT 0x0501 +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 #endif #include +// TODO: I think NOMINMAX above takes care of this already. So these can probably be removed. // disable Windows versions of min/max -- we'll use the typesafe STL versions instead. #undef min #undef max diff --git a/plugins/CDVDnull/CDVD.h b/plugins/CDVDnull/CDVD.h index a23f45a9a3..264a9a5b74 100644 --- a/plugins/CDVDnull/CDVD.h +++ b/plugins/CDVDnull/CDVD.h @@ -17,19 +17,10 @@ #ifndef __CDVD_H__ #define __CDVD_H__ -#ifdef _WIN32 -#include -#endif - #define CDVDdefs #include "PS2Edefs.h" #include "PS2Eext.h" -#ifdef _MSC_VER -#include -#include -#endif - /*#ifdef _MSC_VER #define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK #else diff --git a/plugins/GSdx/targetver.h b/plugins/GSdx/targetver.h index 95461871f8..ba3f81934a 100644 --- a/plugins/GSdx/targetver.h +++ b/plugins/GSdx/targetver.h @@ -20,37 +20,5 @@ */ #pragma once -/* -// Including SDKDDKVer.h defines the highest available Windows platform. -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. - -#include -*/ - -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. - -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif - -#include +#define _WIN32_WINNT 0x0600 diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props index 0a13416da1..fa802053ae 100644 --- a/plugins/GSdx/vsprops/common.props +++ b/plugins/GSdx/vsprops/common.props @@ -8,7 +8,6 @@ true - _WINDOWS;_WIN32_WINNT=0x501;%(PreprocessorDefinitions) Fast false Level4 diff --git a/plugins/LilyPad/Global.h b/plugins/LilyPad/Global.h index a2e8512e0e..e3f0df4de7 100644 --- a/plugins/LilyPad/Global.h +++ b/plugins/LilyPad/Global.h @@ -97,13 +97,7 @@ extern Window GSwin; #endif #ifdef _MSC_VER -// Actually works with 0x0400, but need 0x500 to get XBUTTON defines, -// 0x501 to get raw input structures, and 0x0600 to get WM_MOUSEHWHEEL. -#define WINVER 0x0600 -#define _WIN32_WINNT WINVER -#define __MSCW32__ - - +#define _WIN32_WINNT 0x0600 #include #ifdef PCSX2_DEBUG diff --git a/plugins/cdvdGigaherz/src/CDVD.h b/plugins/cdvdGigaherz/src/CDVD.h index 5f80274426..e2d96a6d5f 100644 --- a/plugins/cdvdGigaherz/src/CDVD.h +++ b/plugins/cdvdGigaherz/src/CDVD.h @@ -16,6 +16,7 @@ #ifndef __CDVD_H__ #define __CDVD_H__ +#define _WIN32_WINNT 0x0600 #include #include diff --git a/plugins/cdvdGigaherz/src/PlainIso.cpp b/plugins/cdvdGigaherz/src/PlainIso.cpp index 152b7abd73..451e1583bb 100644 --- a/plugins/cdvdGigaherz/src/PlainIso.cpp +++ b/plugins/cdvdGigaherz/src/PlainIso.cpp @@ -13,8 +13,6 @@ * If not, see . */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include "CDVD.h" #pragma warning(disable:4200) #pragma pack(1) diff --git a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp index 92a7aaf299..2c5ebabb3c 100644 --- a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp +++ b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp @@ -13,8 +13,6 @@ * If not, see . */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include "../CDVD.h" #pragma warning(disable:4200) #pragma pack(1) diff --git a/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp b/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp index 0ec221bb5a..b5c6430810 100644 --- a/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp +++ b/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp @@ -13,8 +13,6 @@ * If not, see . */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include "../CDVD.h" #pragma warning(disable:4200) #pragma pack(1) diff --git a/plugins/cdvdGigaherz/src/Windows/config.cpp b/plugins/cdvdGigaherz/src/Windows/config.cpp index 272b706eb7..420149321f 100644 --- a/plugins/cdvdGigaherz/src/Windows/config.cpp +++ b/plugins/cdvdGigaherz/src/Windows/config.cpp @@ -15,13 +15,12 @@ //License along with this library; if not, write to the Free Software //Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // -//#include "spu2.h" -#include + +#include "../CDVD.h" +#include #include #include "resource.h" -#include "../cdvd.h" - // Config Vars // DEBUG diff --git a/plugins/spu2-x/src/Windows/WinConfig.h b/plugins/spu2-x/src/Windows/WinConfig.h index 1c2cd5598a..269ff0c465 100644 --- a/plugins/spu2-x/src/Windows/WinConfig.h +++ b/plugins/spu2-x/src/Windows/WinConfig.h @@ -17,11 +17,9 @@ #pragma once -#ifndef WINVER -# define WINVER 0x0501 -# define _WIN32_WINNT 0x0501 +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 #endif - #include #include #include diff --git a/plugins/spu2-x/src/Windows/dsp.cpp b/plugins/spu2-x/src/Windows/dsp.cpp index 075283283c..db8debf23e 100644 --- a/plugins/spu2-x/src/Windows/dsp.cpp +++ b/plugins/spu2-x/src/Windows/dsp.cpp @@ -18,9 +18,7 @@ #include "Global.h" -# define WINVER 0x0501 -# define _WIN32_WINNT 0x0501 - +#define _WIN32_WINNT 0x0600 #include #include diff --git a/plugins/xpad/stdafx.h b/plugins/xpad/stdafx.h index 5576f8097d..79ef23aede 100644 --- a/plugins/xpad/stdafx.h +++ b/plugins/xpad/stdafx.h @@ -4,33 +4,9 @@ #pragma once -#pragma warning(disable: 4996 4995 4324 4100 4101 4201) +#define WIN32_LEAN_AND_MEAN -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. - -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define _WIN32_WINNT 0x0600 #include #include diff --git a/plugins/xpad/vsprops/common.props b/plugins/xpad/vsprops/common.props index a061cc9fef..2698a1f853 100644 --- a/plugins/xpad/vsprops/common.props +++ b/plugins/xpad/vsprops/common.props @@ -8,8 +8,6 @@ true - WIN32;_WINDOWS;_WIN32_WINNT=0x500;%(PreprocessorDefinitions) - Fast false Level4 ProgramDatabase