mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-15 00:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style nits.

Browse Source
This commit is contained in:
Themaister 2013-05-28 09:38:47 +02:00
parent a292b5252c
commit 70e99c30ab
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -58,11 +58,12 @@ ifeq ($(findstring Haiku,$(OS)),)
LIBS = -lm LIBS = -lm
endif endif
ifndef GLOBAL_CONFIG_DIR DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS
ifneq ($(GLOBAL_CONFIG_DIR), )
GLOBAL_CONFIG_DIR = /etc GLOBAL_CONFIG_DIR = /etc
endif endif
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
ifeq ($(REENTRANT_TEST), 1) ifeq ($(REENTRANT_TEST), 1)
DEFINES += -Dmain=retroarch_main DEFINES += -Dmain=retroarch_main

1
qb/qb.libs.sh
View File

@ -6,7 +6,6 @@ cat /dev/null > "$MAKEFILE_DEFINES" > "$CONFIG_DEFINES"
#cat /dev/null > "${MAKEFILE_DEFINES:=.MAKEFILE_DEFINES}" > "${CONFIG_DEFINES=.CONFIG_DEFINES}" #cat /dev/null > "${MAKEFILE_DEFINES:=.MAKEFILE_DEFINES}" > "${CONFIG_DEFINES=.CONFIG_DEFINES}"
[ "$PREFIX" ] || PREFIX="/usr/local" [ "$PREFIX" ] || PREFIX="/usr/local"
[ "$CONFIG_DIR" ] || CONFIG_DIR="/etc"
add_define_header() add_define_header()
{ echo "$1=$2" >> "$CONFIG_DEFINES";} { echo "$1=$2" >> "$CONFIG_DEFINES";}

6
settings.c
View File

@ -380,9 +380,9 @@ static config_file_t *open_default_config_file(void)
// Try this as a last chance ... // Try this as a last chance ...
if (!conf) if (!conf)
{ {
#ifndef GLOBAL_CONFIG_DIR #ifndef GLOBAL_CONFIG_DIR
#define GLOBAL_CONFIG_DIR "/etc" #define GLOBAL_CONFIG_DIR "/etc"
#endif #endif
fill_pathname_join(conf_path, GLOBAL_CONFIG_DIR, "retroarch.cfg", sizeof(conf_path)); fill_pathname_join(conf_path, GLOBAL_CONFIG_DIR, "retroarch.cfg", sizeof(conf_path));
RARCH_LOG("Looking for config in: \"%s\".\n", conf_path); RARCH_LOG("Looking for config in: \"%s\".\n", conf_path);
conf = config_file_new(conf_path); conf = config_file_new(conf_path);