diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2011-04-26 04:40:44 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:16:28 +0300 |
| commit | 370d44264878b06f3e662fc40a2b75cd03f2b3ad (patch) | |
| tree | 253236b6176566077241ffdb442b4a5e0c24c44b /std/windows.hpp | |
| parent | ff62311bad5e563933215778a8fe0e3fa81a12d6 (diff) | |
[win] Moved all WINVER defines to common.pri so they affect also 3party libs
Diffstat (limited to 'std/windows.hpp')
| -rw-r--r-- | std/windows.hpp | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/std/windows.hpp b/std/windows.hpp index 62f2b50947..3484605265 100644 --- a/std/windows.hpp +++ b/std/windows.hpp @@ -1,24 +1,31 @@ #pragma once -// we support only Vista and above at the moment (due to conditional variables) -#ifdef _WIN32_WINNT - #undef _WIN32_WINNT -#endif -#define _WIN32_WINNT 0x0600 - -#ifdef WINVER - #undef WINVER -#endif -#define WINVER 0x0600 - -#ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN -#endif - -#ifdef _WIN32_IE - #undef _WIN32_IE -#endif -#define _WIN32_IE 0x0600 +// These defines are moved to common.pri because +// they should be equal for all libraries, even for 3party ones + +//#ifdef _WIN32_WINNT +// #undef _WIN32_WINNT +//#endif +//#define _WIN32_WINNT 0x0501 + +//#ifdef WINVER +// #undef WINVER +//#endif +//#define WINVER 0x0501 + +//#ifndef WIN32_LEAN_AND_MEAN +// #define WIN32_LEAN_AND_MEAN 1 +//#endif + +//#ifdef _WIN32_IE +// #undef _WIN32_IE +//#endif +//#define _WIN32_IE 0x0501 + +//#ifdef NTDDI_VERSION +// #undef NTDDI_VERSION +//#endif +//#define NTDDI_VERSION 0x05010000 #include <windows.h> |