From 30219ee9e0f5967a4383c88d5c0f1b04678f987b Mon Sep 17 00:00:00 2001
From: Maximus32 <rgaiser@gmail.com>
Date: Tue, 5 Jan 2021 15:53:36 +0100
Subject: [PATCH] Always use "CFG" folder (no more "CFG-DEV")

---
 include/compatupd.h | 4 ----
 include/opl.h       | 8 --------
 src/ethsupport.c    | 2 +-
 src/hddsupport.c    | 4 ++--
 src/supportbase.c   | 4 ++--
 src/usbsupport.c    | 2 +-
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/include/compatupd.h b/include/compatupd.h
index b6e2e2c8f..46baaf346 100644
--- a/include/compatupd.h
+++ b/include/compatupd.h
@@ -5,11 +5,7 @@
 #define OPL_COMPAT_HTTP_HOST "sx.sytes.net"
 #define OPL_COMPAT_HTTP_PORT 80
 #define OPL_COMPAT_HTTP_RETRIES 3
-#if OPL_IS_DEV_BUILD
-#define OPL_COMPAT_HTTP_URI "/oplcl/sync.ashx?code=%s&device=%d&dev=1"
-#else
 #define OPL_COMPAT_HTTP_URI "/oplcl/sync.ashx?code=%s&device=%d"
-#endif
 
 void oplUpdateGameCompat(int UpdateAll);
 int oplGetUpdateGameCompatStatus(unsigned int *done, unsigned int *total);
diff --git a/include/opl.h b/include/opl.h
index 4af49a0da..5dea7b098 100644
--- a/include/opl.h
+++ b/include/opl.h
@@ -41,14 +41,6 @@
 // Last Played Auto Start
 #include <time.h>
 
-#define OPL_IS_DEV_BUILD 1 //Define if this build is a development build.
-
-#ifdef OPL_IS_DEV_BUILD
-#define OPL_FOLDER "CFG-DEV"
-#else
-#define OPL_FOLDER "CFG"
-#endif
-
 //Master password for disabling the parental lock.
 #define OPL_PARENTAL_LOCK_MASTER_PASS "989765"
 
diff --git a/src/ethsupport.c b/src/ethsupport.c
index 585aa3e68..ce13f3827 100644
--- a/src/ethsupport.c
+++ b/src/ethsupport.c
@@ -779,7 +779,7 @@ static void ethGetLegacyAppsPath(char *path, int max)
 
 static void ethGetLegacyAppsInfo(char *path, int max, char *name)
 {
-    snprintf(path, max, "%s" OPL_FOLDER "\\%s.cfg", ethPrefix, name);
+    snprintf(path, max, "%sCFG\\%s.cfg", ethPrefix, name);
 }
 
 static item_list_t ethGameList = {
diff --git a/src/hddsupport.c b/src/hddsupport.c
index 016c050e8..e6b33fc5b 100644
--- a/src/hddsupport.c
+++ b/src/hddsupport.c
@@ -414,7 +414,7 @@ static config_set_t *hddGetConfig(int id)
     char path[256];
     hdl_game_info_t *game = &hddGames.games[id];
 
-    snprintf(path, sizeof(path), "%s" OPL_FOLDER "/%s.cfg", hddPrefix, game->startup);
+    snprintf(path, sizeof(path), "%sCFG/%s.cfg", hddPrefix, game->startup);
     config_set_t *config = configAlloc(0, NULL, path);
     configRead(config); //Does not matter if the config file exists or not.
 
@@ -603,7 +603,7 @@ static void hddGetLegacyAppsPath(char *path, int max)
 
 static void hddGetLegacyAppsInfo(char *path, int max, char *name)
 {
-    snprintf(path, max, "%s" OPL_FOLDER "/%s.cfg", hddPrefix, name);
+    snprintf(path, max, "%sCFG/%s.cfg", hddPrefix, name);
 }
 
 static item_list_t hddGameList = {
diff --git a/src/supportbase.c b/src/supportbase.c
index 22931fa9f..a94b21e6b 100644
--- a/src/supportbase.c
+++ b/src/supportbase.c
@@ -719,7 +719,7 @@ void sbRename(base_game_info_t **list, const char *prefix, const char *sep, int
 config_set_t *sbPopulateConfig(base_game_info_t *game, const char *prefix, const char *sep)
 {
     char path[256];
-    snprintf(path, sizeof(path), "%s" OPL_FOLDER "%s%s.cfg", prefix, sep, game->startup);
+    snprintf(path, sizeof(path), "%sCFG%s%s.cfg", prefix, sep, game->startup);
     config_set_t *config = configAlloc(0, NULL, path);
     configRead(config); //Does not matter if the config file could be loaded or not.
 
@@ -748,7 +748,7 @@ static void sbCreateFoldersFromList(const char *path, const char **folders)
 
 void sbCreateFolders(const char *path, int createDiscImgFolders)
 {
-    const char *basicFolders[] = {OPL_FOLDER, "THM", "LNG", "ART", "VMC", "CHT", "APPS", NULL};
+    const char *basicFolders[] = {"CFG", "THM", "LNG", "ART", "VMC", "CHT", "APPS", NULL};
     const char *discImgFolders[] = {"CD", "DVD", NULL};
 
     sbCreateFoldersFromList(path, basicFolders);
diff --git a/src/usbsupport.c b/src/usbsupport.c
index facd8f866..84e2a2bda 100644
--- a/src/usbsupport.c
+++ b/src/usbsupport.c
@@ -445,7 +445,7 @@ static void usbGetLegacyAppsPath(char *path, int max)
 
 static void usbGetLegacyAppsInfo(char *path, int max, char *name)
 {
-    snprintf(path, max, "%s" OPL_FOLDER "/%s.cfg", usbPrefix, name);
+    snprintf(path, max, "%sCFG/%s.cfg", usbPrefix, name);
 }
 
 static item_list_t usbGameList = {