diff --git a/common/lib.sh b/common/lib.sh index 0de5e5d79..7e24461d7 100755 --- a/common/lib.sh +++ b/common/lib.sh @@ -62,7 +62,7 @@ start_vcpkg () { # clone repo and setup vcpkg git clone https://github.com/Microsoft/vcpkg.git vcpkg pushd vcpkg - git checkout -f 2023.12.12 + git checkout -f 62aa449 echo 'set(VCPKG_BUILD_TYPE release)' >> triplets/community/x64-linux-dynamic.cmake # add release target to the triplet in use, so only release is being built popd diff --git a/engines/warzone2100/env.sh b/engines/warzone2100/env.sh index 8c48ed037..af182d174 100755 --- a/engines/warzone2100/env.sh +++ b/engines/warzone2100/env.sh @@ -3,4 +3,4 @@ export STEAM_APP_ID_LIST="1241950" export LICENSE_PATH="./source/COPYING" export ADDITIONAL_LICENSES="./source/COPYING.NONGPL ./source/COPYING.README" -export LIBRARIES="sodium glslc" +export LIBRARIES="glslc" diff --git a/engines/warzone2100/vcpkg.json b/engines/warzone2100/vcpkg.json index 86eb5cc4f..cfaa1c919 100644 --- a/engines/warzone2100/vcpkg.json +++ b/engines/warzone2100/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "dependencies": [ "physfs", - "minizip" + "minizip", + "libsodium" ] } diff --git a/libraries/sodium/build.sh b/libraries/sodium/build.sh deleted file mode 100755 index 799f65b21..000000000 --- a/libraries/sodium/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# CLONE PHASE -git clone https://github.com/jedisct1/libsodium.git libsodium -pushd libsodium -git checkout -f stable -popd - -# BUILD PHASE -pushd "libsodium" -./configure -make -j "$(nproc)" -DESTDIR="$pfx" make install -popd diff --git a/libraries/sodium/env.sh b/libraries/sodium/env.sh deleted file mode 100755 index 17e047c97..000000000 --- a/libraries/sodium/env.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -export LIBRARY_LICENSES="./libsodium/LICENSE" -export LIBRARY_COPY_TO_LIB="$pfx/usr/local/lib/libsodium*.so*"