cleanup and minor switch adjustments

Hydr8gon · Dec 22, 2018 · 852afbb · 852afbb
1 parent c648b19
commit 852afbb
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 123 deletions.
diff --git a/src/Config.cpp b/src/Config.cpp
@@ -31,7 +31,6 @@ namespace Config
 
 const char* kConfigFile = "melonDS.ini";
 
-#ifndef __SWITCH__
 int KeyMapping[12];
 int JoyMapping[12];
 
@@ -40,7 +39,6 @@ int HKJoyMapping[HK_MAX];
 
 int WindowWidth;
 int WindowHeight;
-#endif
 
 int ScreenRotation;
 int ScreenGap;
@@ -54,23 +52,17 @@ int DirectBoot;
 
 int Threaded3D;
 
-#ifndef __SWITCH__
 int SocketBindAnyAddr;
-#endif
 
 int SavestateRelocSRAM;
 
 int AudioVolume;
 int MicInputType;
-#ifndef __SWITCH__0
 char MicWavPath[512];
-#endif
 
 char LastROMFolder[512];
 
-#ifdef __SWITCH__
 int SwitchOverclock;
-#endif
 
 typedef struct
 {

diff --git a/src/Config.h b/src/Config.h
@@ -36,7 +36,6 @@ bool HasConfigFile(const char* fileName);
 void Load();
 void Save();
 
-#ifndef __SWITCH__
 extern int KeyMapping[12];
 extern int JoyMapping[12];
 
@@ -45,7 +44,6 @@ extern int HKJoyMapping[HK_MAX];
 
 extern int WindowWidth;
 extern int WindowHeight;
-#endif
 
 extern int ScreenRotation;
 extern int ScreenGap;
@@ -59,23 +57,17 @@ extern int DirectBoot;
 
 extern int Threaded3D;
 
-#ifndef __SWITCH__
 extern int SocketBindAnyAddr;
-#endif
 
 extern int SavestateRelocSRAM;
 
 extern int AudioVolume;
 extern int MicInputType;
-#ifndef __SWITCH__
 extern char MicWavPath[512];
-#endif
 
 extern char LastROMFolder[512];
 
-#ifdef __SWITCH__
 extern int SwitchOverclock;
-#endif
 
 }