From 23b984ec21ffd4625e29bd93ed78c9a0562d7552 Mon Sep 17 00:00:00 2001 From: Ensiform Date: Tue, 2 Jan 2024 20:49:33 -0600 Subject: [PATCH] Upgrade vcpkg --- .github/workflows/ci.yml | 2 +- x86-linux-ete.cmake | 7 ------- x86-linux-toolchain.cmake | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 x86-linux-ete.cmake delete mode 100644 x86-linux-toolchain.cmake diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 414cd48..f03bbaf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: CI on: [push, pull_request] env: - VCPKG_COMMIT_HASH: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50 + VCPKG_COMMIT_HASH: c8696863d371ab7f46e213d8f5ca923c4aef2a00 jobs: createrelease: name: createrelease diff --git a/x86-linux-ete.cmake b/x86-linux-ete.cmake deleted file mode 100644 index fd0b637..0000000 --- a/x86-linux-ete.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x86) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) - -set(VCPKG_CMAKE_SYSTEM_NAME Linux) - -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE $ENV{TOOLCHAIN_PATH}/x86-linux-toolchain.cmake) \ No newline at end of file diff --git a/x86-linux-toolchain.cmake b/x86-linux-toolchain.cmake deleted file mode 100644 index fc3a159..0000000 --- a/x86-linux-toolchain.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_PROCESSOR i686) - -set(CMAKE_C_COMPILER_ARG1 -m32) -set(CMAKE_CXX_COMPILER_ARG1 -m32) \ No newline at end of file