mirrors-yuzu-emu/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-11-22 16:24:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

externals: Update to fmt 10 and add format_as formatter for BitField

Browse source 
Implicit conversions are now disallowed in fmt 10. Use format_as to convert to the underlying type.
This commit is contained in:
Morph 2023-05-28 15:00:05 -04:00
parent b26018e2e6
commit 9950a388d2
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -212,7 +212,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.79.0 REQUIRED context) find_package(Boost 1.79.0 REQUIRED context)
find_package(enet 1.3 MODULE) find_package(enet 1.3 MODULE)
find_package(fmt 9 REQUIRED) find_package(fmt 10 REQUIRED)
find_package(inih 52 MODULE COMPONENTS INIReader) find_package(inih 52 MODULE COMPONENTS INIReader)
find_package(LLVM MODULE COMPONENTS Demangle) find_package(LLVM MODULE COMPONENTS Demangle)
find_package(lz4 REQUIRED) find_package(lz4 REQUIRED)

2
externals/vcpkg vendored

@ -1 +1 @@
Subproject commit a7b6122f6b6504d16d96117336a0562693579933 Subproject commit 656fcc6ab2b05c6d999b7eaca717027ac3738f71

5
src/common/bit_field.h
View file

@ -188,3 +188,8 @@ private:
template <std::size_t Position, std::size_t Bits, typename T> template <std::size_t Position, std::size_t Bits, typename T>
using BitFieldBE = BitField<Position, Bits, T, BETag>; using BitFieldBE = BitField<Position, Bits, T, BETag>;
template <std::size_t Position, std::size_t Bits, typename T, typename EndianTag = LETag>
inline auto format_as(BitField<Position, Bits, T, EndianTag> bitfield) {
return bitfield.Value();
}

4
vcpkg.json
View file

@ -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": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", "builtin-baseline": "656fcc6ab2b05c6d999b7eaca717027ac3738f71",
"version": "1.0", "version": "1.0",
"dependencies": [ "dependencies": [
"boost-algorithm", "boost-algorithm",
@ -53,7 +53,7 @@
}, },
{ {
"name": "fmt", "name": "fmt",
"version": "9.0.0" "version": "10.0.0"
} }
] ]
} }