Browse Source
Merge pull request #9983 from Morph1984/boost
CMakeLists: Update boost to 1.81.0
pull/15/merge
liamwhite
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
4 additions and
4 deletions
-
CMakeLists.txt
-
externals/vcpkg
-
src/common/zstd_compression.cpp
-
vcpkg.json
|
|
@ -210,7 +210,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) |
|
|
# ======================================================================= |
|
|
# ======================================================================= |
|
|
|
|
|
|
|
|
# Enforce the search mode of non-required packages for better and shorter failure messages |
|
|
# Enforce the search mode of non-required packages for better and shorter failure messages |
|
|
find_package(Boost 1.73.0 REQUIRED context) |
|
|
|
|
|
|
|
|
find_package(Boost 1.81.0 REQUIRED context) |
|
|
find_package(enet 1.3 MODULE) |
|
|
find_package(enet 1.3 MODULE) |
|
|
find_package(fmt 9 REQUIRED) |
|
|
find_package(fmt 9 REQUIRED) |
|
|
find_package(inih 52 MODULE COMPONENTS INIReader) |
|
|
find_package(inih 52 MODULE COMPONENTS INIReader) |
|
|
|
|
|
@ -1 +1 @@ |
|
|
Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9 |
|
|
|
|
|
|
|
|
Subproject commit a7b6122f6b6504d16d96117336a0562693579933 |
|
|
@ -33,7 +33,7 @@ std::vector<u8> CompressDataZSTDDefault(const u8* source, std::size_t source_siz |
|
|
|
|
|
|
|
|
std::vector<u8> DecompressDataZSTD(std::span<const u8> compressed) { |
|
|
std::vector<u8> DecompressDataZSTD(std::span<const u8> compressed) { |
|
|
const std::size_t decompressed_size = |
|
|
const std::size_t decompressed_size = |
|
|
ZSTD_getDecompressedSize(compressed.data(), compressed.size()); |
|
|
|
|
|
|
|
|
ZSTD_getFrameContentSize(compressed.data(), compressed.size()); |
|
|
std::vector<u8> decompressed(decompressed_size); |
|
|
std::vector<u8> decompressed(decompressed_size); |
|
|
|
|
|
|
|
|
const std::size_t uncompressed_result_size = ZSTD_decompress( |
|
|
const std::size_t uncompressed_result_size = ZSTD_decompress( |
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
{ |
|
|
{ |
|
|
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", |
|
|
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", |
|
|
"name": "yuzu", |
|
|
"name": "yuzu", |
|
|
"builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9", |
|
|
|
|
|
|
|
|
"builtin-baseline": "a7b6122f6b6504d16d96117336a0562693579933", |
|
|
"version": "1.0", |
|
|
"version": "1.0", |
|
|
"dependencies": [ |
|
|
"dependencies": [ |
|
|
"boost-algorithm", |
|
|
"boost-algorithm", |
|
|
|
