From 58a654aeea71d7eb29193d129b113a70b7025e5e Mon Sep 17 00:00:00 2001 From: M3ik Shizuka Date: Mon, 1 Feb 2021 22:52:50 +0300 Subject: [PATCH] Add runtime version 10.0.19041.746 and fix generation `cmake -G "Visual Studio 16 2019" -A x64`. --- RpcCore/CMakeLists.txt | 6 +++--- RpcCore/RpcCore4_32bits/RpcInternals.h | 3 ++- RpcCore/RpcCore4_64bits/RpcInternals.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/RpcCore/CMakeLists.txt b/RpcCore/CMakeLists.txt index eea7194..7bf53e9 100644 --- a/RpcCore/CMakeLists.txt +++ b/RpcCore/CMakeLists.txt @@ -23,12 +23,12 @@ foreach(Files ${CoreFiles}) get_filename_component(Dir ${Files} NAME) - if(${CMAKE_GENERATOR} MATCHES "Win64") + if(${CMAKE_GENERATOR} MATCHES "Win64" OR ${CMAKE_GENERATOR_PLATFORM} MATCHES "x64") AddRpcCore(${Dir}) - else(${CMAKE_GENERATOR} MATCHES "Win64") + else(${CMAKE_GENERATOR} MATCHES "Win64" OR ${CMAKE_GENERATOR_PLATFORM} MATCHES "x64") if(${Dir} MATCHES "32bits") AddRpcCore(${Dir}) endif(${Dir} MATCHES "32bits") - endif(${CMAKE_GENERATOR} MATCHES "Win64") + endif(${CMAKE_GENERATOR} MATCHES "Win64" OR ${CMAKE_GENERATOR_PLATFORM} MATCHES "x64") endif (IS_DIRECTORY ${Files} ) endforeach(Files) \ No newline at end of file diff --git a/RpcCore/RpcCore4_32bits/RpcInternals.h b/RpcCore/RpcCore4_32bits/RpcInternals.h index dd1eb3d..5220a53 100644 --- a/RpcCore/RpcCore4_32bits/RpcInternals.h +++ b/RpcCore/RpcCore4_32bits/RpcInternals.h @@ -61,7 +61,8 @@ static UINT64 RPC_CORE_RUNTIME_VERSION[] = { 0xA00004A610001LL, //10.0.19041.1 0xA00004A6101FCLL, //10.0.19041.508 0xA00004A610222LL, //10.0.19041.546 - 0xA00004A610276LL //10.0.19041.630 + 0xA00004A610276LL, //10.0.19041.630 + 0xA00004A6102EALL //10.0.19041.746 }; #ifdef _WIN64 diff --git a/RpcCore/RpcCore4_64bits/RpcInternals.h b/RpcCore/RpcCore4_64bits/RpcInternals.h index 505bbee..0e70097 100644 --- a/RpcCore/RpcCore4_64bits/RpcInternals.h +++ b/RpcCore/RpcCore4_64bits/RpcInternals.h @@ -61,7 +61,8 @@ static UINT64 RPC_CORE_RUNTIME_VERSION[] = { 0xA00004A610001LL, //10.0.19041.1 0xA00004A6101FCLL, //10.0.19041.508 0xA00004A610222LL, //10.0.19041.546 - 0xA00004A610276LL //10.0.19041.630 + 0xA00004A610276LL, //10.0.19041.630 + 0xA00004A6102EALL //10.0.19041.746 }; #define RPC_CORE_DESCRIPTION "Windows 10 64bits runtime core"