diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | externals/vcpkg | 0 | ||||
| -rw-r--r-- | src/common/bit_field.h | 5 | ||||
| -rw-r--r-- | vcpkg.json | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7276ac9dd..7e8f35a4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -212,7 +212,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) | |||
| 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.79.0 REQUIRED context) | 213 | find_package(Boost 1.79.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 10 REQUIRED) |
| 216 | find_package(inih 52 MODULE COMPONENTS INIReader) | 216 | find_package(inih 52 MODULE COMPONENTS INIReader) |
| 217 | find_package(LLVM MODULE COMPONENTS Demangle) | 217 | find_package(LLVM MODULE COMPONENTS Demangle) |
| 218 | find_package(lz4 REQUIRED) | 218 | find_package(lz4 REQUIRED) |
diff --git a/externals/vcpkg b/externals/vcpkg | |||
| Subproject a7b6122f6b6504d16d96117336a056269357993 | Subproject 656fcc6ab2b05c6d999b7eaca717027ac3738f7 | ||
diff --git a/src/common/bit_field.h b/src/common/bit_field.h index e4e58ea45..0168ff9cb 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h | |||
| @@ -188,3 +188,8 @@ private: | |||
| 188 | 188 | ||
| 189 | template <std::size_t Position, std::size_t Bits, typename T> | 189 | template <std::size_t Position, std::size_t Bits, typename T> |
| 190 | using BitFieldBE = BitField<Position, Bits, T, BETag>; | 190 | using BitFieldBE = BitField<Position, Bits, T, BETag>; |
| 191 | |||
| 192 | template <std::size_t Position, std::size_t Bits, typename T, typename EndianTag = LETag> | ||
| 193 | inline auto format_as(BitField<Position, Bits, T, EndianTag> bitfield) { | ||
| 194 | return bitfield.Value(); | ||
| 195 | } | ||
diff --git a/vcpkg.json b/vcpkg.json index 19f99e89e..26f545c6c 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": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", | 4 | "builtin-baseline": "656fcc6ab2b05c6d999b7eaca717027ac3738f71", |
| 5 | "version": "1.0", | 5 | "version": "1.0", |
| 6 | "dependencies": [ | 6 | "dependencies": [ |
| 7 | "boost-algorithm", | 7 | "boost-algorithm", |
| @@ -53,7 +53,7 @@ | |||
| 53 | }, | 53 | }, |
| 54 | { | 54 | { |
| 55 | "name": "fmt", | 55 | "name": "fmt", |
| 56 | "version": "9.0.0" | 56 | "version": "10.0.0" |
| 57 | } | 57 | } |
| 58 | ] | 58 | ] |
| 59 | } | 59 | } |