Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 01:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(macOS) Disabled unusable command line arguments.

Browse source
This commit is contained in:
Leon Styhre 2020-08-23 21:53:21 +02:00
parent 46ab60ad4e
commit 796d2c9ec8
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
INSTALL.md
View file

@ -788,9 +788,6 @@ You can use `--help` or `-h` to view a list of command line options, as shown he
--no-exit Don't show the exit option in the menu --no-exit Don't show the exit option in the menu
--no-splash Don't show the splash screen --no-splash Don't show the splash screen
--debug Print debug information --debug Print debug information
--windowed Windowed mode, should be combined with --resolution
--fullscreen-normal Normal fullscreen mode
--fullscreen-borderless Borderless fullscreen mode (always on top)
--vsync [1/on or 0/off] Turn vsync on or off (default is on) --vsync [1/on or 0/off] Turn vsync on or off (default is on)
--max-vram [size] Max VRAM to use (in mebibytes) before swapping --max-vram [size] Max VRAM to use (in mebibytes) before swapping
--gpu-statistics Display framerate and VRAM usage overlay --gpu-statistics Display framerate and VRAM usage overlay

7
es-app/src/main.cpp
View file

@ -253,8 +253,9 @@ bool parseArgs(int argc, char* argv[])
Settings::getInstance()->setBool("Debug", true); Settings::getInstance()->setBool("Debug", true);
Log::setReportingLevel(LogDebug); Log::setReportingLevel(LogDebug);
} }
// Windowed mode is always selected on Windows. // On Unix, enable settings for the fullscreen mode.
#ifndef _WIN64 // On macOS and Windows only windowed mode is supported.
#if defined(__unix__)
else if (strcmp(argv[i], "--fullscreen-normal") == 0) { else if (strcmp(argv[i], "--fullscreen-normal") == 0) {
Settings::getInstance()->setString("FullscreenMode", "normal"); Settings::getInstance()->setString("FullscreenMode", "normal");
} }
@ -307,7 +308,7 @@ bool parseArgs(int argc, char* argv[])
" --no-exit Don't show the exit option in the menu\n" " --no-exit Don't show the exit option in the menu\n"
" --no-splash Don't show the splash screen\n" " --no-splash Don't show the splash screen\n"
" --debug Print debug information\n" " --debug Print debug information\n"
#ifndef _WIN64 #if defined(__unix__)
" --windowed Windowed mode, should be combined with --resolution\n" " --windowed Windowed mode, should be combined with --resolution\n"
" --fullscreen-normal Normal fullscreen mode\n" " --fullscreen-normal Normal fullscreen mode\n"
" --fullscreen-borderless Borderless fullscreen mode (always on top)\n" " --fullscreen-borderless Borderless fullscreen mode (always on top)\n"

4
es-core/src/Settings.cpp
View file

@ -32,7 +32,7 @@ std::vector<const char*> settings_dont_save {
"ShowExit", // --no-exit "ShowExit", // --no-exit
"SplashScreen", // --no-splash "SplashScreen", // --no-splash
"VSync", // --vsync [1/on or 0/off] "VSync", // --vsync [1/on or 0/off]
#ifndef _WIN64 #if !defined(_WIN64)
"Windowed", // --windowed "Windowed", // --windowed
#endif #endif
"WindowWidth", // Set via --resolution [width] [height] "WindowWidth", // Set via --resolution [width] [height]
@ -224,7 +224,7 @@ void Settings::setDefaults()
mBoolMap["ShowExit"] = true; mBoolMap["ShowExit"] = true;
mBoolMap["SplashScreen"] = true; mBoolMap["SplashScreen"] = true;
mBoolMap["VSync"] = true; mBoolMap["VSync"] = true;
#ifndef _WIN64 #if !defined(_WIN64)
mBoolMap["Windowed"] = false; mBoolMap["Windowed"] = false;
#endif #endif
mIntMap["WindowWidth"] = 0; mIntMap["WindowWidth"] = 0;

2
es-core/src/renderers/Renderer_GL21.cpp
View file

@ -16,7 +16,7 @@
namespace Renderer namespace Renderer
{ {
#ifndef NDEBUG #if !defined(NDEBUG)
#define GL_CHECK_ERROR(Function) (Function, _GLCheckError(#Function)) #define GL_CHECK_ERROR(Function) (Function, _GLCheckError(#Function))
static void _GLCheckError(const char* _funcName) static void _GLCheckError(const char* _funcName)

2
es-core/src/renderers/Renderer_GLES10.cpp
View file

@ -16,7 +16,7 @@
namespace Renderer namespace Renderer
{ {
#ifndef NDEBUG #if !defined(NDEBUG)
#define GL_CHECK_ERROR(Function) (Function, _GLCheckError(#Function)) #define GL_CHECK_ERROR(Function) (Function, _GLCheckError(#Function))
static void _GLCheckError(const char* _funcName) static void _GLCheckError(const char* _funcName)