mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-12-11 14:19:10 +00:00
Merge branch 'main' into user_and_settings
This commit is contained in:
@@ -71,6 +71,7 @@ int main(int argc, char* argv[]) {
|
||||
"values, ignores the config file(s) entirely.\n"
|
||||
" --config-global Run the emulator with the base config file "
|
||||
"only, ignores game specific configs.\n"
|
||||
" --show-fps Enable FPS counter display at startup\n"
|
||||
" -h, --help Display this help message\n";
|
||||
exit(0);
|
||||
}},
|
||||
@@ -178,13 +179,15 @@ int main(int argc, char* argv[]) {
|
||||
game_folder = folder;
|
||||
}},
|
||||
{"--wait-for-debugger", [&](int& i) { waitForDebugger = true; }},
|
||||
{"--wait-for-pid", [&](int& i) {
|
||||
{"--wait-for-pid",
|
||||
[&](int& i) {
|
||||
if (++i >= argc) {
|
||||
std::cerr << "Error: Missing argument for --wait-for-pid\n";
|
||||
exit(1);
|
||||
}
|
||||
waitPid = std::stoi(argv[i]);
|
||||
}}};
|
||||
}},
|
||||
{"--show-fps", [&](int& i) { Config::setShowFpsCounter(true); }}};
|
||||
|
||||
if (argc == 1) {
|
||||
if (!SDL_ShowSimpleMessageBox(
|
||||
|
||||
Reference in New Issue
Block a user