mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 05:08:57 +00:00
Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master
This commit is contained in:
commit
7e6752e8fc
516 changed files with 60670 additions and 270317 deletions
|
@ -45,15 +45,13 @@ const char UPDATER_LOG_FILE[] = "Updater.log";
|
|||
|
||||
std::string UpdaterPath(bool relocated = false)
|
||||
{
|
||||
std::string path(File::GetExeDirectory() + DIR_SEP);
|
||||
#ifdef __APPLE__
|
||||
if (relocated)
|
||||
path += ".Dolphin Updater.2.app";
|
||||
return File::GetExeDirectory() + DIR_SEP + ".Dolphin Updater.2.app";
|
||||
else
|
||||
path += "Dolphin Updater.app";
|
||||
return path;
|
||||
return File::GetBundleDirectory() + DIR_SEP + "Contents/Helpers/Dolphin Updater.app";
|
||||
#else
|
||||
return path + "Updater.exe";
|
||||
return File::GetExeDirectory() + DIR_SEP + "Updater.exe";
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue