asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Improvements to scons defined WINVER/_WIN32_WINNT

Browse source 
(cherry picked from commit 65483d57bf)
This commit is contained in:
Fabio Alessandrelli 2016-11-03 05:20:26 +01:00 • committed by Rémi Verschelde
parent 8a5596322d
commit 9c8ecb45f8
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/unix/ip_unix.cpp
View file

@ -33,10 +33,6 @@
#include <string.h> #include <string.h>
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
// Workaround mingw missing flags!
#ifndef AI_ADDRCONFIG
#define AI_ADDRCONFIG 0x00000400
#endif
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>

10
drivers/unix/socket_helpers.h
View file

@ -3,11 +3,11 @@
#include <string.h> #include <string.h>
#ifdef WINDOWS_ENABLED #if defined(__MINGW32__ ) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 4)
// Workaround mingw missing flags! // Workaround for mingw-w64 < 4.0
#ifndef IPV6_V6ONLY #ifndef IPV6_V6ONLY
#define IPV6_V6ONLY 27 #define IPV6_V6ONLY 27
#endif #endif
#endif #endif
// helpers for sockaddr -> IP_Address and back, should work for posix and winsock. All implementations should use this // helpers for sockaddr -> IP_Address and back, should work for posix and winsock. All implementations should use this

4
platform/windows/detect.py
View file

@ -200,7 +200,7 @@ def configure(env):
env.Append(CPPPATH=['#platform/windows']) env.Append(CPPPATH=['#platform/windows'])
# Targeted Windows version: Vista (and later) # Targeted Windows version: Vista (and later)
env.Append(CPPFLAGS=['-D_WIN32_WINNT=0x0600']) winver = "0x0600" # Windows Vista is the minimum target for windows builds
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):
@ -208,6 +208,7 @@ def configure(env):
env['ENV']['TMP'] = os.environ['TMP'] env['ENV']['TMP'] = os.environ['TMP']
env.Append(CPPPATH=['#platform/windows/include']) env.Append(CPPPATH=['#platform/windows/include'])
env.Append(LIBPATH=['#platform/windows/lib']) env.Append(LIBPATH=['#platform/windows/lib'])
env.Append(CCFLAGS=['/DWINVER=%s' % winver, '/D_WIN32_WINNT=%s' % winver])
if (env["target"] == "release"): if (env["target"] == "release"):
@ -298,6 +299,7 @@ def configure(env):
env.use_windows_spawn_fix() env.use_windows_spawn_fix()
# build using mingw # build using mingw
env.Append(CCFLAGS=['-DWINVER=%s' % winver, '-D_WIN32_WINNT=%s' % winver])
if (os.name == "nt"): if (os.name == "nt"):
env['ENV']['TMP'] = os.environ['TMP'] # way to go scons, you can be so stupid sometimes env['ENV']['TMP'] = os.environ['TMP'] # way to go scons, you can be so stupid sometimes
else: else:

4
platform/winrt/detect.py
View file

@ -136,8 +136,12 @@ def configure(env):
env.Append(CCFLAGS=['/DGLES2_ENABLED']) env.Append(CCFLAGS=['/DGLES2_ENABLED'])
# env.Append(CCFLAGS=['/DGLES1_ENABLED']) # env.Append(CCFLAGS=['/DGLES1_ENABLED'])
winver = "0x0602" # Windows 8 is the minimum target for UWP build
env.Append(CCFLAGS=['/DWINVER=%s' % winver, '/D_WIN32_WINNT=%s' % winver])
LIBS = [ LIBS = [
#'winmm', #'winmm',
'ws2_32',
'libEGL', 'libEGL',
'libGLESv2', 'libGLESv2',
'libANGLE', 'libANGLE',