Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-25 16:41:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Linux 32-bit fix. We cannot allocate > 32MB for 32-bit mmap implementations which is causing issues getting SLIM to work. Also, we should explicitly disable in case it is stuck in someones ppsspp.ini. See: http://lxr.free-electrons.com/source/tools/perf/util/session.c#L1290

Browse Source
This commit is contained in:
Sacha 2013-12-10 23:22:31 +10:00
parent 5a02ea9ff4
commit bdaa6f335f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/Config.cpp
View File

@ -316,10 +316,10 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
network->Get("EnableWlan", &bEnableWlan, false);
IniFile::Section *pspConfig = iniFile.GetOrCreateSection("SystemParam");
#if !defined(ARM) || defined(__SYMBIAN32__)
pspConfig->Get("PSPModel", &iPSPModel, PSP_MODEL_SLIM);
#else
pspConfig->Get("PSPModel", &iPSPModel, PSP_MODEL_FAT);
#if !defined(_M_X64) && !defined(_WIN32) && !defined(__SYMBIAN32__)
// 32-bit mmap cannot map more than 32MB contiguous
iPSPModel = PSP_MODEL_FAT;
#endif
pspConfig->Get("NickName", &sNickName, "PPSSPP");
pspConfig->Get("proAdhocServer", &proAdhocServer, "localhost");