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.
This commit is contained in:
parent
920947f297
commit
6323779596
|
@ -37,19 +37,13 @@
|
|||
#ifndef AI_ADDRCONFIG
|
||||
#define AI_ADDRCONFIG 0x00000400
|
||||
#endif
|
||||
#ifdef UWP_ENABLED
|
||||
#include <ws2tcpip.h>
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
#else
|
||||
#define WINVER 0x0600
|
||||
#include <ws2tcpip.h>
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
#include <iphlpapi.h>
|
||||
#endif
|
||||
#ifndef UWP_ENABLED
|
||||
#include <iphlpapi.h>
|
||||
#endif
|
||||
#else
|
||||
#include <netdb.h>
|
||||
#ifdef ANDROID_ENABLED
|
||||
|
|
|
@ -28,8 +28,6 @@
|
|||
/*************************************************************************/
|
||||
#ifdef WINDOWS_ENABLED
|
||||
|
||||
#define WINVER 0x0500
|
||||
|
||||
#include <windows.h>
|
||||
#include "shlwapi.h"
|
||||
#include "file_access_windows.h"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
//
|
||||
//
|
||||
|
||||
#define WINVER 0x0500
|
||||
#include "context_gl_win.h"
|
||||
|
||||
//#include "drivers/opengl/glwrapper.h"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue