mirror of
https://github.com/libretro/RetroArch
synced 2025-02-07 12:39:54 +00:00
Merge pull request #1028 from heuripedes/cross-compile
Cross compile improvements
This commit is contained in:
commit
560341ec02
@ -6,15 +6,26 @@ TEMP_EXE=.tmp
|
||||
|
||||
ECHOBUF="Checking operating system"
|
||||
#echo -n "Checking operating system"
|
||||
case "$(uname)" in
|
||||
'Linux') OS='Linux';;
|
||||
*'BSD') OS='BSD';;
|
||||
'Darwin') OS='Darwin';;
|
||||
'MINGW32'*) OS='MinGW';;
|
||||
'CYGWIN'*) OS='Cygwin';;
|
||||
'Haiku') OS='Haiku';;
|
||||
*) OS="Win32";;
|
||||
esac
|
||||
|
||||
if [ -n "$CROSS_COMPILE" ]; then
|
||||
case "$CROSS_COMPILE" in
|
||||
*'-mingw32'*) OS='Win32';;
|
||||
*);;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [ -z "$OS" ]; then
|
||||
case "$(uname)" in
|
||||
'Linux') OS='Linux';;
|
||||
*'BSD') OS='BSD';;
|
||||
'Darwin') OS='Darwin';;
|
||||
'MINGW32'*) OS='MinGW';;
|
||||
'CYGWIN'*) OS='Cygwin';;
|
||||
'Haiku') OS='Haiku';;
|
||||
*) OS="Win32";;
|
||||
esac
|
||||
fi
|
||||
|
||||
echo "$ECHOBUF ... $OS"
|
||||
|
||||
# Checking for working C compiler
|
||||
|
@ -103,7 +103,7 @@ check_pkgconf() #$1 = HAVE_$1 $2 = package $3 = version $4 = critical error mess
|
||||
[ "$PKG_CONF_PATH" ] || {
|
||||
ECHOBUF="Checking for pkg-config"
|
||||
# echo -n "Checking for pkg-config"
|
||||
for PKG_CONF_PATH in $(which pkg-config) ''; do [ "$PKG_CONF_PATH" ] && break; done
|
||||
for PKG_CONF_PATH in $(which "${CROSS_COMPILE}pkg-config") ''; do [ "$PKG_CONF_PATH" ] && break; done
|
||||
[ "$PKG_CONF_PATH" ] || { echo "pkg-config not found. Exiting ..."; exit 1;}
|
||||
echo "$ECHOBUF ... $PKG_CONF_PATH"
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user