From ba2a54a9dd6e5a263c5e6886e55b3bc55b95b4ab Mon Sep 17 00:00:00 2001 From: MerryMage Date: Tue, 1 Mar 2016 17:24:18 +0000 Subject: Dependencies: Remove GLFW, Add SDL2 citra: Remove GLFW, Add SDL2 FindSDL2: Do not CACHE SDL2_* variables if library is not found EmuWindow_SDL2: Set minimal client area at initialisation time EmuWindow_SDL2: Corrections EmuWindow_SDL2: Fix no decorations on startup on OS X cmake: windows_copy_files --- src/citra/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/citra/config.h') diff --git a/src/citra/config.h b/src/citra/config.h index c326ec669..d87ef7883 100644 --- a/src/citra/config.h +++ b/src/citra/config.h @@ -9,8 +9,8 @@ class INIReader; class Config { - INIReader* glfw_config; - std::string glfw_config_loc; + INIReader* sdl2_config; + std::string sdl2_config_loc; bool LoadINI(INIReader* config, const char* location, const std::string& default_contents="", bool retry=true); void ReadValues(); -- cgit v1.2.3 From 48366b1071a7e6ee367435b78845b429c0c9c31f Mon Sep 17 00:00:00 2001 From: MerryMage Date: Wed, 2 Mar 2016 12:49:30 +0000 Subject: Config: Use unique_ptr instead of raw pointer --- src/citra/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/citra/config.h') diff --git a/src/citra/config.h b/src/citra/config.h index d87ef7883..52a478146 100644 --- a/src/citra/config.h +++ b/src/citra/config.h @@ -4,19 +4,19 @@ #pragma once +#include #include -class INIReader; +#include class Config { - INIReader* sdl2_config; + std::unique_ptr sdl2_config; std::string sdl2_config_loc; - bool LoadINI(INIReader* config, const char* location, const std::string& default_contents="", bool retry=true); + bool LoadINI(const std::string& default_contents="", bool retry=true); void ReadValues(); public: Config(); - ~Config(); void Reload(); }; -- cgit v1.2.3