Add support for non portable mode (#356)

This commit is contained in:
SSimco 2022-10-11 23:03:26 -07:00 committed by GitHub
parent 2b9edced81
commit d6ba61cf64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 233 additions and 163 deletions

View file

@ -161,7 +161,7 @@ void _putenvSafe(const char* c)
void reconfigureGLDrivers()
{
// reconfigure GL drivers to store
const fs::path nvCacheDir = ActiveSettings::GetPath("shaderCache/driver/nvidia/");
const fs::path nvCacheDir = ActiveSettings::GetCachePath("shaderCache/driver/nvidia/");
std::error_code err;
fs::create_directories(nvCacheDir, err);
@ -245,8 +245,6 @@ void unitTests()
int mainEmulatorHLE()
{
if (!TestWriteAccess(ActiveSettings::GetPath()))
wxMessageBox("Cemu doesn't have write access to it's own directory.\nPlease move it to a different location or run Cemu as administrator!", "Warning", wxOK|wxICON_ERROR); // todo - different error messages per OS
LatteOverlay_init();
// run a couple of tests if in non-release mode
#ifdef CEMU_DEBUG_ASSERT
@ -267,7 +265,7 @@ int mainEmulatorHLE()
// init Cafe system (todo - the stuff above should be part of this too)
CafeSystem::Initialize();
// init title list
CafeTitleList::Initialize(ActiveSettings::GetPath("title_list_cache.xml"));
CafeTitleList::Initialize(ActiveSettings::GetUserDataPath("title_list_cache.xml"));
for (auto& it : GetConfig().game_paths)
CafeTitleList::AddScanPath(it);
fs::path mlcPath = ActiveSettings::GetMlcPath();
@ -281,8 +279,6 @@ int mainEmulatorHLE()
CafeSaveList::SetMLCPath(mlcPath);
CafeSaveList::Refresh();
}
// Create UI
gui_create();
return 0;
}
@ -347,10 +343,8 @@ int wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ L
SDL_SetMainReady();
if (!LaunchSettings::HandleCommandline(lpCmdLine))
return 0;
ActiveSettings::LoadOnce();
NetworkConfig::LoadOnce();
HandlePostUpdate();
return mainEmulatorHLE();
gui_create();
return 0;
}
// entrypoint for debug builds with console
@ -359,10 +353,8 @@ int main(int argc, char* argv[])
SDL_SetMainReady();
if (!LaunchSettings::HandleCommandline(argc, argv))
return 0;
ActiveSettings::LoadOnce();
NetworkConfig::LoadOnce();
HandlePostUpdate();
return mainEmulatorHLE();
gui_create();
return 0;
}
#else
@ -374,11 +366,8 @@ int main(int argc, char *argv[])
#endif
if (!LaunchSettings::HandleCommandline(argc, argv))
return 0;
ActiveSettings::LoadOnce();
NetworkConfig::LoadOnce();
HandlePostUpdate();
return mainEmulatorHLE();
gui_create();
return 0;
}
#endif