From 6323779596dea0db7f58afef7d3d3d5588ef20cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 8 Jan 2017 20:41:11 +0100
Subject: Windows: Define _WIN32_WINRT to 0x0600 (Vista)

Passed as a compiler define to be sure it is always define before windows.h
is loaded. This means that Godot officially requires Vista API or later, it will
not work on Windows XP or earlier.

Also fix a bogus check for Windows 7 API.
---
 platform/windows/context_gl_win.cpp  | 1 -
 platform/windows/detect.py           | 4 ++++
 platform/windows/key_mapping_win.cpp | 2 +-
 platform/windows/os_windows.cpp      | 2 +-
 platform/windows/os_windows.h        | 2 --
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'platform/windows')

diff --git a/platform/windows/context_gl_win.cpp b/platform/windows/context_gl_win.cpp
index 136ac310f6..6b60ade5f0 100644
--- a/platform/windows/context_gl_win.cpp
+++ b/platform/windows/context_gl_win.cpp
@@ -40,7 +40,6 @@
 //
 //
 
-#define WINVER 0x0500
 #include "context_gl_win.h"
 
 //#include "drivers/opengl/glwrapper.h"
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 28030afa82..2262fae031 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -207,6 +207,10 @@ def build_res_file(target, source, env):
 def configure(env):
 
     env.Append(CPPPATH=['#platform/windows'])
+
+    # Targeted Windows version: Vista (and later)
+    env.Append(CPPFLAGS=['-D_WIN32_WINNT=0x0600'])
+
     env['is_mingw'] = False
     if (os.name == "nt" and os.getenv("VCINSTALLDIR")):
         # build using visual studio
diff --git a/platform/windows/key_mapping_win.cpp b/platform/windows/key_mapping_win.cpp
index 00a0ca79c7..9ab222e9ee 100644
--- a/platform/windows/key_mapping_win.cpp
+++ b/platform/windows/key_mapping_win.cpp
@@ -26,8 +26,8 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#define WINVER 0x0500
 #include "key_mapping_win.h"
+
 #include <stdio.h>
 
 struct _WinTranslatePair {
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 971ec25f77..34ea9cd156 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -677,7 +677,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd,UINT uMsg, WPARAM	wParam,	LPARAM	lParam) {
 			print_line("input lang change");
 		} break;
 
-		#if WINVER >= 0x0700 // for windows 7
+		#if WINVER >= 0x0601 // for windows 7
 		case WM_TOUCH: {
 
 			BOOL bHandled = FALSE;
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 19367c758b..e265313f05 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -29,8 +29,6 @@
 #ifndef OS_WINDOWS_H
 #define OS_WINDOWS_H
 
-#define WINVER 0x0600
-
 #include "os/input.h"
 #include "os/os.h"
 #include "context_gl_win.h"
-- 
cgit v1.2.3