ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Add yaml-cpp to cmake

This commit is contained in:
kenshen112 2020-11-14 11:43:25 -07:00 committed by refractionpcsx2
parent 18ea20e7b0
commit 3f6193580c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GameDatabase.cpp
View File

@ -95,7 +95,7 @@ GameDatabaseSchema::GameEntry YamlGameDatabaseImpl::entryFromYaml(const std::str
bool fixValidated = false; bool fixValidated = false;
for (GamefixId id = GamefixId_FIRST; id < pxEnumEnd; ++id) for (GamefixId id = GamefixId_FIRST; id < pxEnumEnd; ++id)
{ {
std::string validFix = wxString(EnumToString(id)) + L"Hack"; std::string validFix = wxString(EnumToString(id)).ToStdString() + L"Hack";
if (validFix == fix) if (validFix == fix)
{ {
fixValidated = true; fixValidated = true;

2
pcsx2/Recording/InputRecording.cpp
View File

@ -332,7 +332,7 @@ bool InputRecording::Play(wxString fileName)
if (!wxFileExists(inputRecordingData.GetFilename() + "_SaveState.p2s")) if (!wxFileExists(inputRecordingData.GetFilename() + "_SaveState.p2s"))
{ {
inputRec::consoleLog(fmt::format("Could not locate savestate file at location - {}_SaveState.p2s", inputRec::consoleLog(fmt::format("Could not locate savestate file at location - {}_SaveState.p2s",
inputRecordingData.GetFilename())); inputRecordingData.GetFilename().ToStdString()));
inputRecordingData.Close(); inputRecordingData.Close();
return false; return false;
} }

2
pcsx2/gui/MainMenuClicks.cpp
View File

@ -956,7 +956,7 @@ void MainEmuFrame::Menu_Capture_Screenshot_Screenshot_As_Click(wxCommandEvent &e
wxFileDialog fileDialog(this, _("Select a file"), g_Conf->Folders.Snapshots.ToAscii(), wxEmptyString, "PNG files (*.png)|*.png", wxFD_SAVE | wxFD_OVERWRITE_PROMPT); wxFileDialog fileDialog(this, _("Select a file"), g_Conf->Folders.Snapshots.ToAscii(), wxEmptyString, "PNG files (*.png)|*.png", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (fileDialog.ShowModal() == wxID_OK) if (fileDialog.ShowModal() == wxID_OK)
GSmakeSnapshot(fileDialog.GetPath()); GSmakeSnapshot(fileDialog.GetPath().c_str());
// Resume emulation // Resume emulation
if (!wasPaused) if (!wasPaused)