diff options
| author | 2023-03-24 10:53:30 -0400 | |
|---|---|---|
| committer | 2023-03-24 10:53:30 -0400 | |
| commit | cfb96720930f916ccb96d0b39fbb6a0d2b804c30 (patch) | |
| tree | a5c92d35eaaa90f898fc81e1cc47bc372c036571 | |
| parent | Merge pull request #9981 from german77/nfp_connect (diff) | |
| parent | zstd: Use ZSTD_getFrameContentSize instead of ZSTD_getDecompressedSize (diff) | |
| download | yuzu-cfb96720930f916ccb96d0b39fbb6a0d2b804c30.tar.gz yuzu-cfb96720930f916ccb96d0b39fbb6a0d2b804c30.tar.xz yuzu-cfb96720930f916ccb96d0b39fbb6a0d2b804c30.zip | |
Merge pull request #9983 from Morph1984/boost
CMakeLists: Update boost to 1.81.0
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | externals/vcpkg | 0 | ||||
| -rw-r--r-- | src/common/zstd_compression.cpp | 2 | ||||
| -rw-r--r-- | vcpkg.json | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6932b6fab..61c95444f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -210,7 +210,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) | |||
| 210 | # ======================================================================= | 210 | # ======================================================================= |
| 211 | 211 | ||
| 212 | # Enforce the search mode of non-required packages for better and shorter failure messages | 212 | # Enforce the search mode of non-required packages for better and shorter failure messages |
| 213 | find_package(Boost 1.73.0 REQUIRED context) | 213 | find_package(Boost 1.81.0 REQUIRED context) |
| 214 | find_package(enet 1.3 MODULE) | 214 | find_package(enet 1.3 MODULE) |
| 215 | find_package(fmt 9 REQUIRED) | 215 | find_package(fmt 9 REQUIRED) |
| 216 | find_package(inih 52 MODULE COMPONENTS INIReader) | 216 | find_package(inih 52 MODULE COMPONENTS INIReader) |
diff --git a/externals/vcpkg b/externals/vcpkg | |||
| Subproject 9b22b40c6c61bf0da2d46346dd44a11e90972cc | Subproject a7b6122f6b6504d16d96117336a056269357993 | ||
diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index b71a41b78..cb6ec171b 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp | |||
| @@ -33,7 +33,7 @@ std::vector<u8> CompressDataZSTDDefault(const u8* source, std::size_t source_siz | |||
| 33 | 33 | ||
| 34 | std::vector<u8> DecompressDataZSTD(std::span<const u8> compressed) { | 34 | std::vector<u8> DecompressDataZSTD(std::span<const u8> compressed) { |
| 35 | const std::size_t decompressed_size = | 35 | const std::size_t decompressed_size = |
| 36 | ZSTD_getDecompressedSize(compressed.data(), compressed.size()); | 36 | ZSTD_getFrameContentSize(compressed.data(), compressed.size()); |
| 37 | std::vector<u8> decompressed(decompressed_size); | 37 | std::vector<u8> decompressed(decompressed_size); |
| 38 | 38 | ||
| 39 | const std::size_t uncompressed_result_size = ZSTD_decompress( | 39 | const std::size_t uncompressed_result_size = ZSTD_decompress( |
diff --git a/vcpkg.json b/vcpkg.json index fbadca0e6..9aadd367c 100644 --- a/vcpkg.json +++ b/vcpkg.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", | 2 | "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", |
| 3 | "name": "yuzu", | 3 | "name": "yuzu", |
| 4 | "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9", | 4 | "builtin-baseline": "a7b6122f6b6504d16d96117336a0562693579933", |
| 5 | "version": "1.0", | 5 | "version": "1.0", |
| 6 | "dependencies": [ | 6 | "dependencies": [ |
| 7 | "boost-algorithm", | 7 | "boost-algorithm", |