Almost there, just a few more blocks to go.

src/gba/Cheats.h

@@ -1,7 +1,11 @@
 #ifndef CHEATS_H
 #define CHEATS_H
 
+#ifndef __LIBRETRO__
 #include "../common/ConfigManager.h"
+#else
+#include "../src/libretro/Utilretro.h"
+#endif
 
 struct CheatsData {
     int code;

src/gba/GBA-arm.cpp

@@ -7,7 +7,11 @@
 #include "../NLS.h"
 #include "../System.h"
 #include "../Util.h"
+#ifndef __LIBRETRO__
 #include "../common/ConfigManager.h"
+#else
+#include "../src/libretro/Utilretro.h"
+#endif
 #include "Cheats.h"
 #include "EEprom.h"
 #include "Flash.h"

src/gba/GBA-thumb.cpp

@@ -10,7 +10,11 @@
 #include "../NLS.h"
 #include "../System.h"
 #include "../Util.h"
+#ifndef __LIBRETRO__
 #include "../common/ConfigManager.h"
+#else
+#include "../src/libretro/Utilretro.h"
+#endif
 #include "Cheats.h"
 #include "EEprom.h"
 #include "Flash.h"

src/gba/GBA.cpp

@@ -10,7 +10,11 @@
 #include "../NLS.h"
 #include "../System.h"
 #include "../Util.h"
+#ifndef __LIBRETRO__
 #include "../common/ConfigManager.h"
+#else
+#include "../src/libretro/Utilretro.h"
+#endif
 #include "../common/Port.h"
 #include "Cheats.h"
 #include "EEprom.h"

src/libretro/UtilRetro.cpp

@@ -14,6 +14,8 @@
 #include "gb/gbGlobals.h"
 #include "gba/gbafilter.h"
 
+#include "UtilRetro.h"
+
 #ifndef _MSC_VER
 #include <strings.h>
 #define _stricmp strcasecmp
@@ -24,6 +26,26 @@ extern int systemRedShift;
 extern int systemGreenShift;
 extern int systemBlueShift;
 
+// Because Configmanager was introduced, this has to be done.
+
+const char* loadDotCodeFile;
+const char* saveDotCodeFile;
+
+int cheatsEnabled = true;
+int saveType = 0;
+int rtcEnabled;
+int frameSkip = 1;
+bool speedup = false;
+bool cpuIsMultiBoot = false;
+bool parseDebug = true;
+int layerSettings = 0xff00;
+int layerEnable = 0xff00;
+bool speedHack = false;
+int cpuSaveType = 0;
+bool mirroringEnable = true;
+bool skipSaveGameBattery = false;
+bool skipSaveGameCheats = false;
+
 extern uint16_t systemColorMap16[0x10000];
 extern uint32_t systemColorMap32[0x10000];
 

src/libretro/UtilRetro.h

@@ -0,0 +1,18 @@
+extern bool speedup;
+extern int cheatsEnabled;
+extern int useBios;
+extern int skipBios;
+extern int synchronize;
+extern int cpuDisableSfx;
+extern bool cpuIsMultiBoot;
+extern bool parseDebug;
+extern bool speedHack;
+extern bool mirroringEnable;
+extern int rtcEnabled;
+
+extern const char *loadDotCodeFile;
+extern const char *saveDotCodeFile;
+
+extern bool skipSaveGameBattery;
+extern bool skipSaveGameCheats;
+#define MAX_CHEATS 100