Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SLikeNet] Update and fix building with x64-mingw-static #18358

Merged
merged 4 commits into from
Jul 23, 2021
Merged

[SLikeNet] Update and fix building with x64-mingw-static #18358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35dbfe0
SLikeNet now builds under MinGW
Pospelove Jun 16, 2021
76021fd
Update ports/slikenet/vcpkg.json
Pospelove Jun 16, 2021
85e6048
Run vcpkg x-add-version
Pospelove Jun 16, 2021
4ea5013
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions ports/slikenet/CONTROL
View file
Open in desktop

This file was deleted.

13 changes: 4 additions & 9 deletions ports/slikenet/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,17 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SLikeSoft/SLikeNet
REF cca394f05e9e9e3e315a85539e648f267d3f2fcc
SHA512 410954bda5a7be309eb71c3078f8ea67ff21aae2ce923f01db77b09265969f1350afb45b90194118bfad274f0a36a2d3bbc38d86a15507fdfc4bc8edc4a0204c
REF 358462052fce7e585fc1cce0a17a7042ba724c08
SHA512 2c932b0a7910ec36dd6a340dd841cefcf259fbdadadff220747d13752181ea14e3c5f05331beb36dea21c0de360edc270ff4c55375bbea23ee2149828f07e9ab
HEAD_REF master
PATCHES
fix-install.patch
)
#Uses an outdated OpenSSL version and is in an experimental namespace any way. As such we delete it here
file(REMOVE_RECURSE "${SOURCE_PATH}/Source/src/crypto" "${SOURCE_PATH}/Source/include/slikenet/crypto")

if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(SLIKENET_ENABLE_STATIC TRUE)
set(SLIKENET_ENABLE_DLL FALSE)
else()
set(SLIKENET_ENABLE_STATIC FALSE)
set(SLIKENET_ENABLE_DLL TRUE)
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SLIKENET_ENABLE_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SLIKENET_ENABLE_DLL)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
Expand Down
10 changes: 10 additions & 0 deletions ports/slikenet/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "slikenet",
"version-string": "2021-06-07",
Pospelove marked this conversation as resolved.
Show resolved Hide resolved
"description": "SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development.",
"homepage": "https://github.com/SLikeSoft/SLikeNet",
"supports": "!uwp",
"dependencies": [
"openssl"
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5785,7 +5785,7 @@
"port-version": 0
},
"slikenet": {
"baseline": "2019-10-22-2",
"baseline": "2021-06-07",
"port-version": 0
},
"sltbench": {
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/slikenet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "48e1226409861a6bbe3d8fc084ea8fea99759360",
"version-string": "2021-06-07",
"port-version": 0
},
{
"git-tree": "fd99081ecbebc7fe7639cc9a61899ff6fb977d04",
"version-string": "2019-10-22-2",
Expand Down