diff options
| -rw-r--r-- | lib/asap/win32/build_xbmc_win32.sh | 2 | ||||
| -rw-r--r-- | lib/ffmpeg/build_xbmc_win32.sh | 2 | ||||
| -rw-r--r-- | lib/libdvd/build-xbmc-win32.sh | 13 | ||||
| -rw-r--r-- | lib/libmpeg2/make-xbmc-lib-win32.sh | 2 | ||||
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 3 | ||||
| -rw-r--r-- | project/Win32BuildSetup/buildmingwlibs.sh | 23 |
6 files changed, 35 insertions, 10 deletions
diff --git a/lib/asap/win32/build_xbmc_win32.sh b/lib/asap/win32/build_xbmc_win32.sh index dc4baf1365..f34d4a2174 100644 --- a/lib/asap/win32/build_xbmc_win32.sh +++ b/lib/asap/win32/build_xbmc_win32.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ -f xbmc_asap.dll ] +if [ "$1" == "clean" ] then make clean fi diff --git a/lib/ffmpeg/build_xbmc_win32.sh b/lib/ffmpeg/build_xbmc_win32.sh index 5befc5a527..adecc4c2ad 100644 --- a/lib/ffmpeg/build_xbmc_win32.sh +++ b/lib/ffmpeg/build_xbmc_win32.sh @@ -5,7 +5,7 @@ then rm -r .libs fi -if [ -f config.mak ] +if [ "$1" == "clean" ] then make distclean fi diff --git a/lib/libdvd/build-xbmc-win32.sh b/lib/libdvd/build-xbmc-win32.sh index 5757a6c491..e8b42a7468 100644 --- a/lib/libdvd/build-xbmc-win32.sh +++ b/lib/libdvd/build-xbmc-win32.sh @@ -1,9 +1,16 @@ #!/bin/sh +MAKECLEAN=0 + +if [ "$1" == "clean" ] +then +MAKECLEAN=1 +fi + #libdvdcss cd libdvdcss echo "***** Cleaning libdvdcss *****" -if [ -f Makefile ] +if [ $MAKECLEAN == 1 ] then make distclean fi @@ -24,7 +31,7 @@ cp libdvdcss/src/.libs/libdvdcss-2.dll /xbmc/system/players/dvdplayer/ #libdvdread cd libdvdread echo "***** Cleaning libdvdread *****" -if [ -f config.mak ] +if [ $MAKECLEAN == 1 ] then make distclean fi @@ -42,7 +49,7 @@ cd .. #libdvdnav cd libdvdnav echo "***** Cleaning libdvdnav *****" -if [ -f config.mak ] +if [ $MAKECLEAN == 1 ] then make distclean fi diff --git a/lib/libmpeg2/make-xbmc-lib-win32.sh b/lib/libmpeg2/make-xbmc-lib-win32.sh index f386922389..e749bd615f 100644 --- a/lib/libmpeg2/make-xbmc-lib-win32.sh +++ b/lib/libmpeg2/make-xbmc-lib-win32.sh @@ -5,7 +5,7 @@ then rm -r libmpeg2/.libs fi -if [ -f config.log ] +if [ "$1" == "clean" ] then make distclean fi diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 1b5488eb5d..b9cd9e98cd 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -136,6 +136,9 @@ IF %comp%==vs2010 ( ECHO Compiling mingw libs ECHO bla>noprompt IF EXIST errormingw del errormingw > NUL + IF %buildmode%==clean ( + ECHO bla>makeclean + ) call buildmingwlibs.bat IF EXIST errormingw ( set DIETEXT="failed to build mingw libs" diff --git a/project/Win32BuildSetup/buildmingwlibs.sh b/project/Win32BuildSetup/buildmingwlibs.sh index 45de9d0f3f..fb544413cc 100644 --- a/project/Win32BuildSetup/buildmingwlibs.sh +++ b/project/Win32BuildSetup/buildmingwlibs.sh @@ -1,9 +1,11 @@ ERRORFILE=/xbmc/project/Win32BuildSetup/errormingw NOPFILE=/xbmc/project/Win32BuildSetup/noprompt +MAKECLEANFILE=/xbmc/project/Win32BuildSetup/makeclean TOUCH=/bin/touch RM=/bin/rm NOPROMPT=0 +MAKECLEAN="" function throwerror () { @@ -41,10 +43,21 @@ if [ -f $NOPFILE ]; then NOPROMPT=1 fi +if [ -f $MAKECLEANFILE ]; then + $RM $MAKECLEANFILE + MAKECLEAN="clean" +fi + # compile our mingw dlls +echo "################################" +echo "## compiling mingw libs" +echo "## NOPROMPT = $NOPROMPT" +echo "## MAKECLEAN = $MAKECLEAN" +echo "################################" + echo "##### building ffmpeg dlls #####" cd /xbmc/lib/ffmpeg/ -sh ./build_xbmc_win32.sh +sh ./build_xbmc_win32.sh $MAKECLEAN setfilepath /xbmc/system/players/dvdplayer checkfiles avcodec-52.dll avcore-0.dll avformat-52.dll avutil-50.dll postproc-51.dll swscale-0.6.1.dll echo "##### building of ffmpeg dlls done #####" @@ -58,14 +71,16 @@ echo "##### building of libdvd dlls done #####" echo "##### building libmpeg2 dlls #####" cd /xbmc/lib/libmpeg2/ -sh ./make-xbmc-lib-win32.sh +sh ./make-xbmc-lib-win32.sh $MAKECLEAN setfilepath /xbmc/system/players/dvdplayer checkfiles libmpeg2-0.dll echo "##### building of libmpeg2 dlls done #####" echo "##### building timidity dlls #####" cd /xbmc/lib/timidity/ -make -f Makefile.win32 clean +if [ $MAKECLEAN == "clean" ]; then + make -f Makefile.win32 clean +fi make -f Makefile.win32 setfilepath /xbmc/system/players/paplayer checkfiles timidity.dll @@ -73,7 +88,7 @@ echo "##### building of timidity dlls done #####" echo "##### building asap dlls #####" cd /xbmc/lib/asap/win32 -sh ./build_xbmc_win32.sh +sh ./build_xbmc_win32.sh $MAKECLEAN setfilepath /xbmc/system/players/paplayer checkfiles xbmc_asap.dll echo "##### building of asap dlls done #####" |