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

Fix build for WinRT using VS2017

Browse source
This commit is contained in:
George Marques 2018-02-18 20:16:53 -03:00
parent e6e4d0417b
commit 1738f5a600
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/winrt/detect.py
View file

@ -56,7 +56,7 @@ def configure(env):
if os.path.isfile(str(os.getenv("ANGLE_SRC_PATH")) + "/winrt/10/src/angle.sln"): if os.path.isfile(str(os.getenv("ANGLE_SRC_PATH")) + "/winrt/10/src/angle.sln"):
env["build_angle"] = True env["build_angle"] = True
if os.getenv('Platform') == "ARM": if str(os.getenv('Platform')).lower() == "arm":
print("Compiled program architecture will be an ARM executable. (forcing bits=32).") print("Compiled program architecture will be an ARM executable. (forcing bits=32).")
@ -104,10 +104,6 @@ def configure(env):
env.Append(CPPPATH=['#platform/winrt','#drivers/windows']) env.Append(CPPPATH=['#platform/winrt','#drivers/windows'])
env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', '/WINMD', '/APPCONTAINER', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1', '/NODEFAULTLIB:"kernel32.lib"', '/NODEFAULTLIB:"ole32.lib"']) env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', '/WINMD', '/APPCONTAINER', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1', '/NODEFAULTLIB:"kernel32.lib"', '/NODEFAULTLIB:"ole32.lib"'])
env.Append(CPPFLAGS=['/D', '__WRL_NO_DEFAULT_LIB__', '/D', 'WIN32', '/DPNG_ABORT=abort']) env.Append(CPPFLAGS=['/D', '__WRL_NO_DEFAULT_LIB__', '/D', 'WIN32', '/DPNG_ABORT=abort'])
env.Append(CPPFLAGS=['/FU', os.environ['VCINSTALLDIR'] + 'lib/store/references/platform.winmd'])
env.Append(CPPFLAGS=['/AI', os.environ['VCINSTALLDIR'] + 'lib/store/references'])
env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/references'])
if (env["target"]=="release"): if (env["target"]=="release"):

4
thirdparty/openssl/winrt.cpp vendored
View file

@ -88,10 +88,12 @@ BOOL __cdecl GetUserObjectInformationW(
_Out_opt_ LPDWORD lpnLengthNeeded) { _Out_opt_ LPDWORD lpnLengthNeeded) {
return 0; return 0;
} }
int __cdecl GetStdHandle( #ifndef STD_ERROR_HANDLE
HANDLE __cdecl GetStdHandle(
_In_ DWORD nStdHandle) { _In_ DWORD nStdHandle) {
return 0; return 0;
} }
#endif
BOOL DeregisterEventSource( BOOL DeregisterEventSource(
_Inout_ HANDLE hEventLog) { _Inout_ HANDLE hEventLog) {
return 0; return 0;