mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9676 from orbea/qb3

Browse Source 
Some minor qb changes.
This commit is contained in:
Twinaphex 2019-11-19 06:15:55 +01:00 committed by GitHub
commit 9df2a6fd99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
qb/qb.comp.sh
View File

@ -15,6 +15,8 @@ cat << EOF > "$TEMP_C"
int main(void) { puts("Hai world!"); return 0; }
EOF
printf %s 'Checking for suitable working C compiler ... '
cc_works=0
add_opt CC no
if [ "$CC" ]; then
@ -40,7 +42,7 @@ elif [ -z "$CC" ]; then
cc_status='not found'
fi
printf %s\\n "Checking for suitable working C compiler ... $CC $cc_status"
printf %s\\n "$CC $cc_status"
if [ "$cc_works" = '0' ] && [ "$USE_LANG_C" = 'yes' ]; then
die 1 'Error: Cannot proceed without a working C compiler.'
@ -52,6 +54,8 @@ cat << EOF > "$TEMP_CXX"
int main() { std::cout << "Hai guise" << std::endl; return 0; }
EOF
printf %s 'Checking for suitable working C++ compiler ... '
cxx_works=0
add_opt CXX no
if [ "$CXX" ]; then
@ -77,29 +81,30 @@ elif [ -z "$CXX" ]; then
cxx_status='not found'
fi
printf %s\\n "Checking for suitable working C++ compiler ... $CXX $cxx_status"
printf %s\\n "$CXX $cxx_status"
if [ "$cxx_works" = '0' ] && [ "$USE_LANG_CXX" = 'yes' ]; then
die : 'Warning: A working C++ compiler was not found, C++ features will be disabled.'
fi
if [ "$OS" = "Win32" ]; then
echobuf="Checking for windres"
if [ -z "$WINDRES" ]; then
WINDRES="$(exists "${CROSS_COMPILE}windres")" || WINDRES=""
[ -z "$WINDRES" ] && die 1 "$echobuf ... Not found. Exiting."
printf %s 'Checking for windres ... '
WINDRES="${WINDRES:-$(exists "${CROSS_COMPILE}windres" || :)}"
printf %s\\n "${WINDRES:=none}"
if [ "$WINDRES" = none ]; then
die 1 'Error: Cannot proceed without windres.'
fi
printf %s\\n "$echobuf ... $WINDRES"
fi
if [ -z "$PKG_CONF_PATH" ]; then
PKGCONF="$(exists "${CROSS_COMPILE}pkgconf" ||
exists "${CROSS_COMPILE}pkg-config" || :)"
printf %s 'Checking for pkg-config ... '
PKG_CONF_PATH="${PKGCONF:-none}"
fi
PKG_CONF_PATH="${PKG_CONF_PATH:-$(exists "${CROSS_COMPILE}pkgconf" ||
exists "${CROSS_COMPILE}pkg-config" || :)}"
printf %s\\n "Checking for pkg-config ... $PKG_CONF_PATH"
printf %s\\n "${PKG_CONF_PATH:=none}"
if [ "$PKG_CONF_PATH" = "none" ]; then
die : 'Warning: pkg-config not found, package checks will fail.'

24
qb/qb.libs.sh
View File

@ -162,22 +162,22 @@ check_lib()
include="${7:-}"
error="${8:-}"
answer='no'
printf %s "$MSG $lib"
printf %s "$MSG $lib ... "
eval "set -- $INCLUDE_DIRS $LIBRARY_DIRS $5 $FLAGS $LDFLAGS $lib"
"$COMPILER" -o "$TEMP_EXE" "$TEMP_CODE" "$@" >>config.log 2>&1 && answer='yes'
printf %s\\n " ... $answer"
printf %s\\n "$answer"
if [ "$answer" = 'yes' ] && [ "$include" ]; then
answer='no'
eval "set -- $INCLUDES"
for dir do
[ "$answer" = 'yes' ] && break
printf %s "Checking existence of /$dir/$include"
printf %s "Checking existence of /$dir/$include ... "
if [ -d "/$dir/$include" ]; then
eval "${val}_CFLAGS=\"-I/$dir/$include\""
answer='yes'
fi
printf %s\\n " ... $answer"
printf %s\\n "$answer"
done
fi
@ -234,7 +234,7 @@ check_pkgconf()
eval "set -- ${2#* }"
for pkgnam do
[ "$answer" = 'yes' ] && break
printf %s "$MSG $pkgnam$ECHOBUF"
printf %s "$MSG $pkgnam$ECHOBUF ... "
eval "set -- $ver"
for pkgver do
if "$PKG_CONF_PATH" --atleast-version="$pkgver" "$pkgnam"; then
@ -246,7 +246,7 @@ check_pkgconf()
break
fi
done
printf %s\\n " ... $version"
printf %s\\n "$version"
done
eval "HAVE_$val=\"$answer\""
@ -280,11 +280,11 @@ check_header()
done
printf %s\\n "int main(void) { return 0; }" >> "$TEMP_C"
answer='no'
printf %s "Checking presence of header file $CHECKHEADER"
printf %s "Checking presence of header file $CHECKHEADER ... "
eval "set -- $CFLAGS $INCLUDE_DIRS"
"$CC" -o "$TEMP_EXE" "$TEMP_C" "$@" >>config.log 2>&1 && answer='yes'
eval "HAVE_$val=\"$answer\""
printf %s\\n " ... $answer"
printf %s\\n "$answer"
rm -f -- "$TEMP_C" "$TEMP_EXE"
setval="$(eval "printf %s \"\$USER_$val\"")"
if [ "$setval" = 'yes' ] && [ "$answer" = 'no' ]; then
@ -316,11 +316,11 @@ EOF
answer='no'
val="$1"
macro="$2"
printf %s "Checking presence of predefined macro $macro$ECHOBUF"
printf %s "Checking presence of predefined macro $macro$ECHOBUF ... "
eval "set -- $CFLAGS $INCLUDE_DIRS"
"$CC" -o "$TEMP_EXE" "$TEMP_C" "$@" >>config.log 2>&1 && answer='yes'
eval "HAVE_$val=\"$answer\""
printf %s\\n " ... $answer"
printf %s\\n "$answer"
rm -f -- "$TEMP_C" "$TEMP_EXE"
setval="$(eval "printf %s \"\$USER_$val\"")"
if [ "$setval" = 'yes' ] && [ "$answer" = 'no' ]; then
@ -339,10 +339,10 @@ check_switch()
printf %s\\n 'int main(void) { return 0; }' > "$TEMP_CODE"
answer='no'
printf %s "Checking for availability of switch $3 in $COMPILER"
printf %s "Checking for availability of switch $3 in $COMPILER ... "
"$COMPILER" -o "$TEMP_EXE" "$TEMP_CODE" "$3" >>config.log 2>&1 && answer='yes'
eval "HAVE_$2=\"$answer\""
printf %s\\n " ... $answer"
printf %s\\n "$answer"
rm -f -- "$TEMP_CODE" "$TEMP_EXE"
if [ "$answer" = 'no' ] && [ "${4:-}" ]; then
die 1 "$4"

4
qb/qb.moc.sh
View File

@ -18,6 +18,8 @@ EOF
add_opt MOC no
if [ "$HAVE_QT" = "yes" ]; then
printf %s 'Checking for moc ... '
moc_works=0
if [ "$MOC" ]; then
QT_SELECT="$QT_VERSION" \
@ -49,7 +51,7 @@ if [ "$HAVE_QT" = "yes" ]; then
moc_status='not found'
fi
printf %s\\n "Checking for moc ... $MOC $moc_status"
printf %s\\n "$MOC $moc_status"
if [ "$HAVE_MOC" != 'yes' ]; then
HAVE_QT='no'