mirror of https://github.com/microsoft/vcpkg.git
[gamenetworkingsockets] update to 1.5.0 (#51446)
This commit is contained in:
parent
279bdb8865
commit
f039f011ea
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/cmake/GameNetworkingSocketsConfig.cmake.in b/cmake/GameNetworkingSocketsConfig.cmake.in
|
||||
index 1a27988..5076a6e 100644
|
||||
--- a/cmake/GameNetworkingSocketsConfig.cmake.in
|
||||
+++ b/cmake/GameNetworkingSocketsConfig.cmake.in
|
||||
@@ -3,6 +3,7 @@
|
||||
include(CMakeFindDependencyMacro)
|
||||
|
||||
find_dependency(Threads)
|
||||
+find_dependency(Protobuf)
|
||||
|
||||
if(@USE_CRYPTO@ STREQUAL "OpenSSL")
|
||||
find_dependency(OpenSSL)
|
||||
|
|
@ -1,35 +1,32 @@
|
|||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ValveSoftware/GameNetworkingSockets
|
||||
REF 505c697d0abef5da2ff3be35aa4ea3687597c3e9 # v1.4.1
|
||||
SHA512 3e4b4da138f2b356169e6504aa899c9eca4fba5b5fcaed2a0ae8a2f5828976dd00af9f3262c75bd6d820300da87ebe32da152fecddc278a651f3b33eb59142df
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-depend-protobuf.patch
|
||||
protobuf-6.patch
|
||||
)
|
||||
|
||||
set(CRYPTO_BACKEND OpenSSL)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DBUILD_TESTS=OFF
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
-DBUILD_TOOLS=OFF
|
||||
-DUSE_CRYPTO=${CRYPTO_BACKEND}
|
||||
-DUSE_CRYPTO25519=${CRYPTO_BACKEND}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/GameNetworkingSockets")
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ValveSoftware/GameNetworkingSockets
|
||||
REF 4fbfe83ef4d59a12dc32baeff2c33e511af93157 # v1.5.0
|
||||
SHA512 221ca364d7bd2dfb4e9764ca272998e06a15f9978977bc3eec34dd469fe290ebb983f2895f1d33e10ea01b23ce83d213489365d2203155f2476eefe25f33df85
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
set(CRYPTO_BACKEND OpenSSL)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DBUILD_TESTS=OFF
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
-DBUILD_TOOLS=OFF
|
||||
-DUSE_CRYPTO=${CRYPTO_BACKEND}
|
||||
-DUSE_CRYPTO25519=${CRYPTO_BACKEND}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/GameNetworkingSockets")
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/steamnetworkingsockets/steamnetworkingsockets_internal.h b/src/steamnetworkingsockets/steamnetworkingsockets_internal.h
|
||||
index d5b0a97..ecaa53d 100644
|
||||
--- a/src/steamnetworkingsockets/steamnetworkingsockets_internal.h
|
||||
+++ b/src/steamnetworkingsockets/steamnetworkingsockets_internal.h
|
||||
@@ -674,7 +674,7 @@ extern bool BSteamNetworkingIdentityToProtobufInternal( const SteamNetworkingIde
|
||||
#define SteamNetworkingIdentityToProtobuf( identity, msg, field_identity_string, field_identity_legacy_binary, field_legacy_steam_id ) \
|
||||
{ SteamDatagramErrMsg identityToProtobufErrMsg; \
|
||||
if ( !BSteamNetworkingIdentityToProtobuf( identity, msg, field_identity_string, field_identity_legacy_binary, field_legacy_steam_id, identityToProtobufErrMsg ) ) { \
|
||||
- AssertMsg2( false, "Failed to serialize identity to %s message. %s", msg.GetTypeName().c_str(), identityToProtobufErrMsg ); \
|
||||
+ AssertMsg2( false, "Failed to serialize identity to %s message. %s", std::string(msg.GetTypeName()).c_str(), identityToProtobufErrMsg ); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "gamenetworkingsockets",
|
||||
"version": "1.4.1",
|
||||
"port-version": 2,
|
||||
"version": "1.5.0",
|
||||
"description": "GameNetworkingSockets is a basic transport layer for games.",
|
||||
"homepage": "https://github.com/ValveSoftware/GameNetworkingSockets",
|
||||
"license": "BSD-3-Clause",
|
||||
|
|
|
|||
|
|
@ -3269,8 +3269,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"gamenetworkingsockets": {
|
||||
"baseline": "1.4.1",
|
||||
"port-version": 2
|
||||
"baseline": "1.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"gamma": {
|
||||
"baseline": "gamma-2018-01-27",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "19ce25b025f2222b763b4408a03e90fde3ad117d",
|
||||
"version": "1.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "96aeec88d1035ce7acb7ba62e78e27a077df6aa6",
|
||||
"version": "1.4.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue