ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compile fix for Linux/libretro

This commit is contained in:
Connor McLaughlin 2020-08-21 00:26:14 +10:00
parent bca609a2a6
commit f852be74e8
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -38,6 +38,7 @@ Other features include:
- CPU Recompiler/JIT (x86-64 and AArch64) - CPU Recompiler/JIT (x86-64 and AArch64)
- Hardware (D3D11, OpenGL, Vulkan) and software rendering - Hardware (D3D11, OpenGL, Vulkan) and software rendering
- Upscaling and true colour (24-bit) in hardware renderers - Upscaling and true colour (24-bit) in hardware renderers
- PGXP for geometry precision and texture correction
- "Fast boot" for skipping BIOS splash/intro - "Fast boot" for skipping BIOS splash/intro
- Save state support - Save state support
- Windows, Linux, **highly experimental** macOS support - Windows, Linux, **highly experimental** macOS support

6
src/core/game_settings.cpp
View File

@ -205,7 +205,7 @@ bool Database::Load(const char* path)
CSimpleIniA ini; CSimpleIniA ini;
SI_Error err = ini.LoadFile(fp.get()); SI_Error err = ini.LoadFile(fp.get());
if (err != S_OK) if (err != SI_OK)
{ {
Log_ErrorPrintf("Failed to parse game settings ini: %d", static_cast<int>(err)); Log_ErrorPrintf("Failed to parse game settings ini: %d", static_cast<int>(err));
return false; return false;
@ -243,7 +243,7 @@ void Database::SetEntry(const std::string& code, const std::string& name, const
if (fp) if (fp)
{ {
SI_Error err = ini.LoadFile(fp.get()); SI_Error err = ini.LoadFile(fp.get());
if (err != S_OK) if (err != SI_OK)
Log_ErrorPrintf("Failed to parse game settings ini: %d. Contents will be lost.", static_cast<int>(err)); Log_ErrorPrintf("Failed to parse game settings ini: %d. Contents will be lost.", static_cast<int>(err));
} }
else else
@ -266,7 +266,7 @@ void Database::SetEntry(const std::string& code, const std::string& name, const
std::fputs("# DuckStation Game Settings\n\n", fp.get()); std::fputs("# DuckStation Game Settings\n\n", fp.get());
SI_Error err = ini.SaveFile(fp.get()); SI_Error err = ini.SaveFile(fp.get());
if (err != S_OK) if (err != SI_OK)
Log_ErrorPrintf("Failed to save game settings ini: %d", static_cast<int>(err)); Log_ErrorPrintf("Failed to save game settings ini: %d", static_cast<int>(err));
} }
else else

4
src/duckstation-libretro/libretro_host_interface.cpp
View File

@ -101,7 +101,7 @@ bool LibretroHostInterface::Initialize()
return false; return false;
LoadSettings(); LoadSettings();
FixIncompatibleSettings(); FixIncompatibleSettings(true);
UpdateLogging(); UpdateLogging();
return true; return true;
} }
@ -632,7 +632,7 @@ void LibretroHostInterface::UpdateSettings()
{ {
Settings old_settings(std::move(g_settings)); Settings old_settings(std::move(g_settings));
LoadSettings(); LoadSettings();
FixIncompatibleSettings(); FixIncompatibleSettings(false);
if (g_settings.gpu_resolution_scale != old_settings.gpu_resolution_scale && if (g_settings.gpu_resolution_scale != old_settings.gpu_resolution_scale &&
g_settings.gpu_renderer != GPURenderer::Software) g_settings.gpu_renderer != GPURenderer::Software)