godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Windows: Define _WIN32_WINRT to 0x0600 (Vista)

Browse Source 
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.

(cherry picked from commit 6323779596)
This commit is contained in:
Rémi Verschelde
2017-01-08 20:41:11 +01:00
parent 5672852351
commit d66740175e
7 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/unix/ip_unix.cpp
View File

@@ -37,17 +37,11 @@
#ifndef AI_ADDRCONFIG #ifndef AI_ADDRCONFIG
#define AI_ADDRCONFIG 0x00000400 #define AI_ADDRCONFIG 0x00000400
#endif #endif
#ifdef WINRT_ENABLED
#include <ws2tcpip.h>
#include <winsock2.h>
#include <windows.h>
#include <stdio.h>
#else
#define WINVER 0x0600
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#ifndef WINRT_ENABLED
#include <iphlpapi.h> #include <iphlpapi.h>
#endif #endif
#else #else

2
drivers/windows/file_access_windows.cpp
View File

@@ -28,8 +28,6 @@
/*************************************************************************/ /*************************************************************************/
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
#define WINVER 0x0500
#include <windows.h> #include <windows.h>
#include "shlwapi.h" #include "shlwapi.h"
#include "file_access_windows.h" #include "file_access_windows.h"

1
platform/windows/context_gl_win.cpp
View File

@@ -40,7 +40,6 @@
// //
// //
#define WINVER 0x0500
#include "context_gl_win.h" #include "context_gl_win.h"
//#include "drivers/opengl/glwrapper.h" //#include "drivers/opengl/glwrapper.h"

4
platform/windows/detect.py
View File

@@ -198,6 +198,10 @@ def build_res_file(target, source, env):
def configure(env): def configure(env):
env.Append(CPPPATH=['#platform/windows']) env.Append(CPPPATH=['#platform/windows'])
# Targeted Windows version: Vista (and later)
env.Append(CPPFLAGS=['-D_WIN32_WINNT=0x0600'])
env['is_mingw'] = False env['is_mingw'] = False
if (os.name == "nt" and os.getenv("VSINSTALLDIR") != None): if (os.name == "nt" and os.getenv("VSINSTALLDIR") != None):
# build using visual studio # build using visual studio

2
platform/windows/key_mapping_win.cpp
View File

@@ -26,8 +26,8 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#define WINVER 0x0500
#include "key_mapping_win.h" #include "key_mapping_win.h"
#include <stdio.h> #include <stdio.h>
struct _WinTranslatePair { struct _WinTranslatePair {

2
platform/windows/os_windows.cpp
View File

@@ -686,7 +686,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd,UINT uMsg, WPARAM wParam, LPARAM lParam) {
print_line("input lang change"); print_line("input lang change");
} break; } break;
#if WINVER >= 0x0700 // for windows 7 #if WINVER >= 0x0601 // for windows 7
case WM_TOUCH: { case WM_TOUCH: {
BOOL bHandled = FALSE; BOOL bHandled = FALSE;

2
platform/windows/os_windows.h
View File

@@ -29,8 +29,6 @@
#ifndef OS_WINDOWS_H #ifndef OS_WINDOWS_H
#define OS_WINDOWS_H #define OS_WINDOWS_H
#define WINVER 0x0600
#include "os/input.h" #include "os/input.h"
#include "os/os.h" #include "os/os.h"
#include "context_gl_win.h" #include "context_gl_win.h"