From d1a1f2ae4cfeb7068936bcd9dfa367236b234a8e Mon Sep 17 00:00:00 2001 From: WiSo Date: Tue, 1 Feb 2011 20:18:37 +0100 Subject: [PATCH] [WIN32] mingw: refactored file check --- project/Win32BuildSetup/buildmingwlibs.sh | 35 +++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/project/Win32BuildSetup/buildmingwlibs.sh b/project/Win32BuildSetup/buildmingwlibs.sh index df9b9b6d4ace6..02fa81e8e4143 100644 --- a/project/Win32BuildSetup/buildmingwlibs.sh +++ b/project/Win32BuildSetup/buildmingwlibs.sh @@ -14,6 +14,22 @@ function throwerror () fi } +function setfilepath () +{ + FILEPATH=$1 +} + +function checkfiles () +{ + for i in $@; do + FILE=$FILEPATH/$i + if [ ! -f $FILE ]; then + throwerror "$FILE" + exit 1 + fi + done +} + # cleanup if [ -f $ERRORFILE ]; then $RM $ERRORFILE @@ -28,25 +44,14 @@ fi # compile our mingw dlls echo "##### building ffmpeg dlls #####" sh /xbmc/lib/ffmpeg/build_xbmc_win32.sh -# check if dlls are build -for i in avcodec-52.dll avformat-52.dll avutil-50.dll postproc-51.dll swscale-0.6.1.dll; do -FILE=/xbmc/system/players/dvdplayer/$i -if [ ! -f $FILE ]; then - throwerror "$FILE" - exit 1 -fi -done +setfilepath /xbmc/system/players/dvdplayer +checkfiles avcodec-52.dll avformat-52.dll avutil-50.dll postproc-51.dll swscale-0.6.1.dll echo "##### building of ffmpeg dlls done #####" echo "##### building libdvd dlls #####" sh /xbmc/lib/libdvd/build-xbmc-win32.sh - -for i in libdvdcss-2.dll libdvdnav.dll; do - FILE=/xbmc/system/players/dvdplayer/$i - if [ ! -f $FILE ]; then - throwerror "$FILE" - exit 1 -fi +setfilepath /xbmc/system/players/dvdplayer +checkfiles libdvdcss-2.dll libdvdnav.dll done echo "##### building of libdvd dlls done #####"