mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 20:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from libretro/master

Browse Source 
update
This commit is contained in:
alphanu1 2018-05-01 18:39:20 +01:00 committed by GitHub
commit 533f762e52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/cbs/menu_cbs_ok.c
View File

@ -2090,12 +2090,12 @@ static void menu_input_st_string_cb_cheat_file_save_as(
menu_input_dialog_end();
}
#define default_action_dialog_start(funcname, _label_setting, _idx, _cb) \
static int (funcname)(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) \
#define default_action_dialog_start(funcname, _label, _idx, _cb) \
static int (funcname)(const char *path, const char *label_setting, unsigned type, size_t idx, size_t entry_idx) \
{ \
menu_input_ctx_line_t line; \
line.label = label; \
line.label_setting = _label_setting; \
line.label = _label; \
line.label_setting = label_setting; \
line.type = type; \
line.idx = (_idx); \
line.cb = _cb; \

3
qb/config.libs.sh
View File

@ -282,7 +282,8 @@ if [ "$HAVE_QT" != 'no' ]; then
#check_val '' QT5WEBENGINE -lQt5WebEngine QT5WEBENGINE
if [ "$HAVE_QT5CORE" = "no" ] || [ "$HAVE_QT5GUI" = "no" ] || [ "$HAVE_QT5WIDGETS" = "no" ]; then
die 1 'Error: Qt support requested, but required libraries could not be found.'
die : 'Notice: Not building Qt support, required libraries were not found.'
HAVE_QT=no
else
HAVE_QT=yes
fi

9
qb/qb.comp.sh
View File

@ -87,9 +87,14 @@ if [ "$HAVE_QT" != "no" ]; then
echobuf="Checking for moc"
if [ -z "$MOC" ]; then
MOC="$(exists "moc")" || MOC=""
[ -z "$MOC" ] && die 1 "$echobuf ... Not found. Exiting."
if [ -z "$MOC" ]; then
die : "$echobuf ... Not found."
else
echo "$echobuf ... $MOC"
fi
else
echo "$echobuf ... $MOC"
fi
echo "$echobuf ... $MOC"
fi
if [ -z "$PKG_CONF_PATH" ]; then