Merge branch 'master' of github.com:libretro/libretro-super

This commit is contained in:
radius 2015-03-07 13:45:48 -05:00
commit 72b06efbe9
2 changed files with 2 additions and 3 deletions

View File

@ -69,14 +69,14 @@ libretro_fetch() {
local git_submodules local git_submodules
local i local i
eval "num_git_urls=\$libretro_${1}_mgit_urls" eval "num_git_urls=\${libretro_${1}_mgit_urls:-0}"
if [ "$num_git_urls" -lt 1 ]; then if [ "$num_git_urls" -lt 1 ]; then
echo "Cannot fetch \"$num_git_urls\" multiple git URLs" echo "Cannot fetch \"$num_git_urls\" multiple git URLs"
return 1 return 1
fi fi
[ "$module_dir" != "." ] && echo_cmd "mkdir -p \"$WORKDIR/$module_dir\"" [ "$module_dir" != "." ] && echo_cmd "mkdir -p \"$WORKDIR/$module_dir\""
for i in seq 0 $num_git_urls; do for (( i=0; i < $num_git_urls; ++i )); do
eval "git_url=\$libretro_${1}_mgit_url_$i" eval "git_url=\$libretro_${1}_mgit_url_$i"
eval "git_subdir=\$libretro_${1}_mgit_dir_$i" eval "git_subdir=\$libretro_${1}_mgit_dir_$i"
eval "git_submodules=\$libretro_${1}_mgit_submodules_$i" eval "git_submodules=\$libretro_${1}_mgit_submodules_$i"

View File

@ -5,7 +5,6 @@ register_module() {
core|devkit|player) core|devkit|player)
if [ -n "$2" ]; then if [ -n "$2" ]; then
eval "libretro_${1}s=\"\$libretro_${1}s $2::\"" eval "libretro_${1}s=\"\$libretro_${1}s $2::\""
echo "Registering $1: $2"
else else
echo "register_module:Trying to register a $1 without a name" echo "register_module:Trying to register a $1 without a name"
exit 1 exit 1