Skip to content

Use rapidyaml 0.11.x #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubin55 wants to merge 1 commit into
base: libretroization
Choose a base branch
from
Open

Use rapidyaml 0.11.x #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/rapidyaml/rapidyaml
Open in desktop
Submodule rapidyaml updated 296 files
2 changes: 1 addition & 1 deletion cmake/SearchForStuff.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if((GCC_VERSION VERSION_EQUAL "9.0" OR GCC_VERSION VERSION_GREATER "9.0") AND GC
endif()

find_optional_system_library(fmt 3rdparty/fmt/fmt 7.1.3)
find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0)
find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.11.1)
find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
if (${zstd_TYPE} STREQUAL System)
alias_library(Zstd::Zstd zstd::libzstd_shared)
Expand Down
7 changes: 4 additions & 3 deletions pcsx2/GameDatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,9 +868,10 @@ u32 GameDatabaseSchema::GameEntry::applyGSHardwareFixes(Pcsx2Config::GSOptions&
void GameDatabase::initDatabase()
{
ryml::Callbacks rymlCallbacks = ryml::get_callbacks();
rymlCallbacks.m_error = [](const char* msg, size_t msg_len, ryml::Location loc, void*) {
Console.Error("[YAML] Parsing error at {%s}:{%s} (bufpos={%s}): {%s}",
loc.line, loc.col, loc.offset, msg);
rymlCallbacks.m_error_parse = [](c4::csubstr msg, ryml::ErrorDataParse const& errdata, void*) {
Console.Error("[YAML] Parsing error at {%zu}:{%zu} (bufpos={%zu}): {%.*s}",
errdata.ymlloc.line, errdata.ymlloc.col, errdata.ymlloc.offset,
(int)msg.len, msg.str);
};
ryml::set_callbacks(rymlCallbacks);
c4::set_error_callback([](const char* msg, size_t msg_size) {
Expand Down