aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/buildsteps/windows/buildffmpeg.sh5
-rw-r--r--tools/buildsteps/windows/buildlibdvd.sh5
-rw-r--r--tools/buildsteps/windows/make-mingwlibs.sh21
3 files changed, 2 insertions, 29 deletions
diff --git a/tools/buildsteps/windows/buildffmpeg.sh b/tools/buildsteps/windows/buildffmpeg.sh
index 67e375e012..0ca6eacefe 100644
--- a/tools/buildsteps/windows/buildffmpeg.sh
+++ b/tools/buildsteps/windows/buildffmpeg.sh
@@ -161,8 +161,3 @@ do_print_status "$LIBNAME-$VERSION (${BITS})" "$blue_color" "Configuring"
do_makelib &&
cp $FFMPEGDESTDIR/bin/*.dll /xbmc/system/ &&
tagSuccessFulBuild $FFMPEGDESTDIR $FFMPEG_VERSION_FILE /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/windows
-
-#remove the bgprocessfile for signaling the process end
-if [ -f $BGPROCESSFILE ]; then
- rm $BGPROCESSFILE
-fi
diff --git a/tools/buildsteps/windows/buildlibdvd.sh b/tools/buildsteps/windows/buildlibdvd.sh
index 0e983db94f..9dc33069bc 100644
--- a/tools/buildsteps/windows/buildlibdvd.sh
+++ b/tools/buildsteps/windows/buildlibdvd.sh
@@ -77,8 +77,3 @@ strip -S $LIBDVDPREFIX/bin/libdvdnav.dll &&
cp $LIBDVDPREFIX/bin/libdvdnav.dll /xbmc/system/ &&
tagSuccessFulBuild $LIBDVDPREFIX /xbmc/tools/depends/target/libdvdcss/DVDCSS-VERSION /xbmc/tools/depends/target/libdvdread/DVDREAD-VERSION /xbmc/tools/depends/target/libdvdnav/DVDNAV-VERSION /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/windows
do_print_status "libdvd (${BITS})" "$green_color" "Done"
-
-#remove the bgprocessfile for signaling the process end
-if [ -f $BGPROCESSFILE ]; then
- rm $BGPROCESSFILE
-fi \ No newline at end of file
diff --git a/tools/buildsteps/windows/make-mingwlibs.sh b/tools/buildsteps/windows/make-mingwlibs.sh
index 50470cd8d3..af82d746cb 100644
--- a/tools/buildsteps/windows/make-mingwlibs.sh
+++ b/tools/buildsteps/windows/make-mingwlibs.sh
@@ -1,9 +1,6 @@
Win32BuildSetup=/xbmc/project/Win32BuildSetup
ERRORFILE=$Win32BuildSetup/errormingw
-NOPFILE=$Win32BuildSetup/noprompt
-MAKECLEANFILE=$Win32BuildSetup/makeclean
-BGPROCESSFILE=$Win32BuildSetup/bgprocess
TOUCH=/bin/touch
RM=/bin/rm
NOPROMPT=0
@@ -48,19 +45,6 @@ checkfiles() {
done
}
-#start the process backgrounded
-runBackgroundProcess() {
- $TOUCH $BGPROCESSFILE
- echo "backgrounding: sh $1 $BGPROCESSFILE $TOOLS & (workdir: $(PWD))"
- sh $1 $BGPROCESSFILE $targetBuild $TOOLS &
- echo "waiting on bgprocess..."
- while [ -f $BGPROCESSFILE ]; do
- echo -n "."
- sleep 5
- done
-}
-
-
buildProcess() {
cd /xbmc/tools/buildsteps/windows
@@ -79,7 +63,7 @@ echo -ne "\033]0;building FFmpeg $BITS\007"
echo "-------------------------------------------------"
echo " building FFmpeg $BITS"
echo "-------------------------------------------------"
-runBackgroundProcess "./buildffmpeg.sh $MAKECLEAN"
+./buildffmpeg.sh
setfilepath /xbmc/system
checkfiles avcodec-57.dll avformat-57.dll avutil-55.dll postproc-54.dll swscale-4.dll avfilter-6.dll swresample-2.dll
echo "-------------------------------------------------"
@@ -90,8 +74,7 @@ echo -ne "\033]0;building libdvd $BITS\007"
echo "-------------------------------------------------"
echo " building libdvd $BITS"
echo "-------------------------------------------------"
-runBackgroundProcess "./buildlibdvd.sh $MAKECLEAN"
-setfilepath /xbmc/system
+./buildlibdvd.sh
checkfiles libdvdcss-2.dll libdvdnav.dll
echo "-------------------------------------------------"
echo " building of libdvd $BITS done..."