ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update - add HAVE_CONFIGFILE to Makefile.griffin

This commit is contained in:
twinaphex 2020-02-03 18:12:43 +01:00
parent cd20966fc8
commit 12e82baeb3
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.griffin
View File

@ -197,6 +197,7 @@ else ifeq ($(libogc_platform), 1)
HAVE_VIDEO_LAYOUT := 0 HAVE_VIDEO_LAYOUT := 0
HAVE_ZLIB := 1 HAVE_ZLIB := 1
HAVE_7ZIP := 1 HAVE_7ZIP := 1
HAVE_CONFIGFILE := 1
RARCH_CONSOLE = 1 RARCH_CONSOLE = 1
ifeq ($(platform), wii) ifeq ($(platform), wii)
@ -260,6 +261,7 @@ else ifeq ($(platform), psp1)
HAVE_KERNEL_PRX := 1 HAVE_KERNEL_PRX := 1
#HAVE_LANGEXTRA := 1 #HAVE_LANGEXTRA := 1
RARCH_CONSOLE = 1 RARCH_CONSOLE = 1
HAVE_CONFIGFILE := 1
ifeq ($(BUILD_PRX), 1) ifeq ($(BUILD_PRX), 1)
LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS) LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
@ -317,6 +319,7 @@ else ifeq ($(platform), vita)
HAVE_THREADS := 1 HAVE_THREADS := 1
HAVE_LIBRETRODB := 1 HAVE_LIBRETRODB := 1
RARCH_CONSOLE = 1 RARCH_CONSOLE = 1
HAVE_CONFIGFILE := 1
else ifeq ($(platform), windows_msvc6_x86) else ifeq ($(platform), windows_msvc6_x86)
HAVE_RPNG := 1 HAVE_RPNG := 1
HAVE_RJPEG := 1 HAVE_RJPEG := 1
@ -340,6 +343,7 @@ else ifeq ($(platform), windows_msvc6_x86)
HAVE_DYLIB := 1 HAVE_DYLIB := 1
HAVE_DYNAMIC := 1 HAVE_DYNAMIC := 1
HAVE_GRIFFIN_CPP := 1 HAVE_GRIFFIN_CPP := 1
HAVE_CONFIGFILE := 1
EXT_TARGET := $(TARGET_NAME).exe EXT_TARGET := $(TARGET_NAME).exe
EXT_INTER_TARGET := $(TARGET_NAME).exe EXT_INTER_TARGET := $(TARGET_NAME).exe
@ -383,6 +387,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
HAVE_DYLIB := 1 HAVE_DYLIB := 1
HAVE_DYNAMIC := 1 HAVE_DYNAMIC := 1
HAVE_GRIFFIN_CPP := 1 HAVE_GRIFFIN_CPP := 1
HAVE_CONFIGFILE := 1
EXT_TARGET := $(TARGET_NAME).exe EXT_TARGET := $(TARGET_NAME).exe
EXT_INTER_TARGET := $(TARGET_NAME).exe EXT_INTER_TARGET := $(TARGET_NAME).exe
@ -432,6 +437,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
HAVE_DYNAMIC := 1 HAVE_DYNAMIC := 1
HAVE_GRIFFIN_CPP := 1 HAVE_GRIFFIN_CPP := 1
HAVE_DIRECTX ?= 1 HAVE_DIRECTX ?= 1
HAVE_CONFIGFILE := 1
EXT_TARGET := $(TARGET_NAME).exe EXT_TARGET := $(TARGET_NAME).exe
EXT_INTER_TARGET := $(TARGET_NAME).exe EXT_INTER_TARGET := $(TARGET_NAME).exe
@ -483,6 +489,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
HAVE_GRIFFIN_CPP := 1 HAVE_GRIFFIN_CPP := 1
HAVE_RUNAHEAD := 1 HAVE_RUNAHEAD := 1
HAVE_DIRECTX ?= 1 HAVE_DIRECTX ?= 1
HAVE_CONFIGFILE := 1
EXT_TARGET := $(TARGET_NAME).exe EXT_TARGET := $(TARGET_NAME).exe
EXT_INTER_TARGET := $(TARGET_NAME).exe EXT_INTER_TARGET := $(TARGET_NAME).exe
@ -557,6 +564,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
HAVE_GRIFFIN_CPP := 1 HAVE_GRIFFIN_CPP := 1
HAVE_RUNAHEAD := 1 HAVE_RUNAHEAD := 1
HAVE_DIRECTX ?= 1 HAVE_DIRECTX ?= 1
HAVE_CONFIGFILE := 1
EXT_TARGET := $(TARGET_NAME).exe EXT_TARGET := $(TARGET_NAME).exe
EXT_INTER_TARGET := $(TARGET_NAME).exe EXT_INTER_TARGET := $(TARGET_NAME).exe
@ -635,6 +643,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
HAVE_GRIFFIN_CPP := 1 HAVE_GRIFFIN_CPP := 1
HAVE_RUNAHEAD := 1 HAVE_RUNAHEAD := 1
HAVE_DIRECTX ?= 1 HAVE_DIRECTX ?= 1
HAVE_CONFIGFILE := 1
EXT_TARGET := $(TARGET_NAME).exe EXT_TARGET := $(TARGET_NAME).exe
EXT_INTER_TARGET := $(TARGET_NAME).exe EXT_INTER_TARGET := $(TARGET_NAME).exe
@ -713,6 +722,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
HAVE_GRIFFIN_CPP := 1 HAVE_GRIFFIN_CPP := 1
HAVE_RUNAHEAD := 1 HAVE_RUNAHEAD := 1
HAVE_DIRECTX ?= 1 HAVE_DIRECTX ?= 1
HAVE_CONFIGFILE := 1
EXT_TARGET := $(TARGET_NAME).exe EXT_TARGET := $(TARGET_NAME).exe
EXT_INTER_TARGET := $(TARGET_NAME).exe EXT_INTER_TARGET := $(TARGET_NAME).exe
@ -973,6 +983,10 @@ ifeq ($(HAVE_THREADS), 1)
endif endif
endif endif
ifeq ($(HAVE_CONFIGFILE), 1)
CFLAGS += -DHAVE_CONFIGFILE
endif
ifeq ($(HAVE_RSOUND), 1) ifeq ($(HAVE_RSOUND), 1)
CFLAGS += -DHAVE_RSOUND CFLAGS += -DHAVE_RSOUND
endif endif

11
configuration.c
View File

@ -56,12 +56,6 @@
#include "uwp/uwp_func.h" #include "uwp/uwp_func.h"
#endif #endif
static const char* invalid_filename_chars[] = {
/* https://support.microsoft.com/en-us/help/905231/information-about-the-characters-that-you-cannot-use-in-site-names--fo */
"~", "#", "%", "&", "*", "{", "}", "\\", ":", "[", "]", "?", "/", "|", "\'", "\"",
NULL
};
/* All config related settings go here. */ /* All config related settings go here. */
struct config_bool_setting struct config_bool_setting
@ -3633,6 +3627,11 @@ void config_load(void *data)
**/ **/
bool config_save_autoconf_profile(const char *path, unsigned user) bool config_save_autoconf_profile(const char *path, unsigned user)
{ {
static const char* invalid_filename_chars[] = {
/* https://support.microsoft.com/en-us/help/905231/information-about-the-characters-that-you-cannot-use-in-site-names--fo */
"~", "#", "%", "&", "*", "{", "}", "\\", ":", "[", "]", "?", "/", "|", "\'", "\"",
NULL
};
unsigned i; unsigned i;
config_file_t *conf = NULL; config_file_t *conf = NULL;
size_t path_size = PATH_MAX_LENGTH * sizeof(char); size_t path_size = PATH_MAX_LENGTH * sizeof(char);

2
griffin/griffin.c
View File

@ -614,7 +614,9 @@ INPUT
#include "../tasks/task_audio_mixer.c" #include "../tasks/task_audio_mixer.c"
#endif #endif
#include "../input/input_keymaps.c" #include "../input/input_keymaps.c"
#ifdef HAVE_CONFIGFILE
#include "../input/input_remapping.c" #include "../input/input_remapping.c"
#endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
#include "../led/drivers/led_overlay.c" #include "../led/drivers/led_overlay.c"

2
menu/menu_displaylist.c
View File

@ -4676,6 +4676,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CONTENT_DIR, MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CONTENT_DIR,
MENU_SETTING_ACTION, 0, 0)) MENU_SETTING_ACTION, 0, 0))
count++; count++;
#endif
for (p = 0; p < max_users; p++) for (p = 0; p < max_users; p++)
{ {
@ -4687,7 +4688,6 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
MENU_SETTINGS_REMAPPING_PORT_BEGIN + p, p, 0)) MENU_SETTINGS_REMAPPING_PORT_BEGIN + p, p, 0))
count++; count++;
} }
#endif
} }
break; break;
case DISPLAYLIST_LOAD_CONTENT_LIST: case DISPLAYLIST_LOAD_CONTENT_LIST: