diff options
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/citra.cpp | 2 | ||||
| -rw-r--r-- | src/citra/citra.rc | 2 | ||||
| -rw-r--r-- | src/citra/config.cpp | 2 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 4 | 
4 files changed, 8 insertions, 2 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index f9387e61c..3114a71db 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -18,7 +18,7 @@  #endif  #ifdef _WIN32 -#include <Windows.h> +#include <windows.h>  #endif  #include "citra/config.h" diff --git a/src/citra/citra.rc b/src/citra/citra.rc index b0edb2e6b..fea603004 100644 --- a/src/citra/citra.rc +++ b/src/citra/citra.rc @@ -5,5 +5,5 @@  // Icon with lowest ID value placed first to ensure application icon  // remains consistent on all systems. -GLFW_ICON               ICON                    "..\\..\\dist\\citra.ico" +CITRA_ICON              ICON                    "../../dist/citra.ico" diff --git a/src/citra/config.cpp b/src/citra/config.cpp index fe74fcd72..29462c982 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -66,6 +66,8 @@ void Config::ReadValues() {      Settings::values.use_scaled_resolution =          sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false);      Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); +    Settings::values.toggle_framelimit = +        sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true);      Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0);      Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index b98dc4d83..001b18ac2 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -64,6 +64,10 @@ use_vsync =  # 0 (default): Default Top Bottom Screen, 1: Single Screen Only, 2: Large Screen Small Screen  layout_option = +#Whether to toggle frame limiter on or off. +# 0: Off , 1  (default): On +toggle_framelimit = +  # Swaps the prominent screen with the other screen.  # For example, if Single Screen is chosen, setting this to 1 will display the bottom screen instead of the top screen.  # 0 (default): Top Screen is prominent, 1: Bottom Screen is prominent  | 
