Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always use "CFG" folder (no more "CFG-DEV") #348

Merged
merged 1 commit into from
Jan 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions include/compatupd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions include/opl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/ethsupport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions src/hddsupport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions src/supportbase.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/usbsupport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down