libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 10:40:39 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #53 from libretro/master

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

3
gfx/video_crt_switch.c
View File

@ -93,8 +93,11 @@ static void crt_screen_setup_aspect(unsigned width, unsigned height)
{
/* detect menu only */
if (width < 1920)
{
width = 704;
height = 480;
}
crt_aspect_ratio_switch(width, height);
}

2
qb/config.libs.sh
View File

@ -270,7 +270,7 @@ check_val '' PULSE -lpulse
check_val '' SDL -lSDL SDL
check_val '' SDL2 -lSDL2 SDL2
if [ "$HAVE_QT" != 'no' ]; then
if [ "$HAVE_QT" != 'no' ] && [ "$MOC_PATH" != 'none' ]; then
check_pkgconf QT5CORE Qt5Core 5.2
check_pkgconf QT5GUI Qt5Gui 5.2
check_pkgconf QT5WIDGETS Qt5Widgets 5.2

22
qb/qb.comp.sh
View File

@ -86,14 +86,20 @@ fi
if [ "$HAVE_QT" != "no" ]; then
echobuf="Checking for moc"
if [ -z "$MOC" ]; then
MOC="$(exists "moc")" || MOC=""
if [ -z "$MOC" ]; then
die : "$echobuf ... Not found."
else
echo "$echobuf ... $MOC"
fi
else
echo "$echobuf ... $MOC"
MOC_PATH="none"
for moc in moc-qt5 moc; do
MOC="$(exists "$moc")" || MOC=""
[ "${MOC}" ] && {
MOC_PATH="$MOC"
break
}
done
fi
echo "$echobuf ... $MOC_PATH"
if [ "$MOC_PATH" = "none" ]; then
die : 'Warning: moc not found, Qt companion support will be disabled.'
fi
fi