From 9557e255226006525f10df104028807911cfe746 Mon Sep 17 00:00:00 2001
From: zilmar <zilmae@pj64-emu.com>
Date: Mon, 13 Mar 2017 19:31:38 +1100
Subject: [PATCH] [Glide64] Have Settings.h in Settings.cpp

---
 Source/Glide64/Gfx_1.3.h    |  1 -
 Source/Glide64/Settings.cpp | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Source/Glide64/Gfx_1.3.h b/Source/Glide64/Gfx_1.3.h
index f897a6182..b7f3a80a6 100644
--- a/Source/Glide64/Gfx_1.3.h
+++ b/Source/Glide64/Gfx_1.3.h
@@ -70,7 +70,6 @@ the plugin
 #include <stddef.h>		// offsetof
 #include <glide.h>
 #include <Common/MemTest.h>
-#include <Settings/Settings.h>
 #include "GlideExtensions.h"
 #include "rdp.h"
 #include "Config.h"
diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp
index a8cf9ea74..70241c577 100644
--- a/Source/Glide64/Settings.cpp
+++ b/Source/Glide64/Settings.cpp
@@ -1,16 +1,9 @@
 #include <Common/StdString.h>
+#include <Settings/Settings.h>
 #include "Gfx_1.3.h"
 #include "ScreenResolution.h"
 #include "SettingsID.h"
 
-#ifdef _WIN32
-int GetCurrentResIndex(void);
-#endif
-
-#ifdef ANDROID
-extern uint32_t g_NativeWidth, g_NativeHeight;
-#endif
-
 extern int g_width, g_height;
 
 CSettings::CSettings() :
@@ -36,7 +29,7 @@ CSettings::CSettings() :
     m_aspectmode(Aspect_4x3),
     m_frame_buffer(0),
     m_fb_crc_mode(fbcrcFast),
-//Texture filtering options
+    //Texture filtering options
     m_texture_dir(""),
     m_ghq_fltr(TextureFilter_None),
     m_ghq_enht(TextureEnht_None),
@@ -109,9 +102,6 @@ void CSettings::RegisterSettings(void)
 
     SetModuleName("Glide64");
     general_setting(Set_Resolution, "resolution", GetDefaultScreenRes());
-#ifdef _WIN32
-    general_setting(Set_FullScreenRes, "FullScreenRes", GetCurrentResIndex());
-#endif
     general_setting(Set_vsync, "vsync", true);
     general_setting(Set_texenh_options, "texenh_options", false);
     general_setting(Set_wrpVRAM, "wrpVRAM", 0);