diff options
| -rw-r--r-- | tools/buildsteps/windows/buildffmpeg.sh (renamed from tools/buildsteps/win32/buildffmpeg.sh) | 6 | ||||
| -rw-r--r-- | tools/buildsteps/windows/buildhelpers.sh (renamed from tools/buildsteps/win32/buildhelpers.sh) | 0 | ||||
| -rw-r--r-- | tools/buildsteps/windows/buildlibdvd.sh (renamed from tools/buildsteps/win32/buildlibdvd.sh) | 4 | ||||
| -rw-r--r-- | tools/buildsteps/windows/fmpeg_options.txt (renamed from tools/buildsteps/win32/fmpeg_options.txt) | 0 | ||||
| -rw-r--r-- | tools/buildsteps/windows/make-mingwlibs.bat (renamed from tools/buildsteps/win32/make-mingwlibs.bat) | 14 | ||||
| -rw-r--r-- | tools/buildsteps/windows/make-mingwlibs.sh (renamed from tools/buildsteps/win32/make-mingwlibs.sh) | 2 | ||||
| -rw-r--r-- | tools/buildsteps/windows/win32/make-mingwlibs.bat | 5 |
7 files changed, 17 insertions, 14 deletions
diff --git a/tools/buildsteps/win32/buildffmpeg.sh b/tools/buildsteps/windows/buildffmpeg.sh index 9a16a01802..25d578e384 100644 --- a/tools/buildsteps/win32/buildffmpeg.sh +++ b/tools/buildsteps/windows/buildffmpeg.sh @@ -3,7 +3,7 @@ [[ -f buildhelpers.sh ]] && source buildhelpers.sh -FFMPEG_CONFIG_FILE=/xbmc/tools/buildsteps/win32/fmpeg_options.txt +FFMPEG_CONFIG_FILE=/xbmc/tools/buildsteps/windows/fmpeg_options.txt FFMPEG_VERSION_FILE=/xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION FFMPEG_BASE_OPTS="--disable-debug --disable-doc --enable-gpl --enable-gnutls --enable-w32threads" FFMPEG_DEFAULT_OPTS="" @@ -12,7 +12,7 @@ FFMPEG_TARGET_OS=mingw32 do_loaddeps $FFMPEG_VERSION_FILE FFMPEGDESTDIR=/xbmc/lib/win32/$LIBNAME -if [ "$(pathChanged $FFMPEGDESTDIR $FFMPEG_VERSION_FILE /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/win32)" == "0" ] +if [ "$(pathChanged $FFMPEGDESTDIR $FFMPEG_VERSION_FILE /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/windows)" == "0" ] then cp $FFMPEGDESTDIR/bin/*.dll /xbmc/system/ if [ -f $BGPROCESSFILE ]; then @@ -160,7 +160,7 @@ 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/win32 +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 diff --git a/tools/buildsteps/win32/buildhelpers.sh b/tools/buildsteps/windows/buildhelpers.sh index b39c86a92f..b39c86a92f 100644 --- a/tools/buildsteps/win32/buildhelpers.sh +++ b/tools/buildsteps/windows/buildhelpers.sh diff --git a/tools/buildsteps/win32/buildlibdvd.sh b/tools/buildsteps/windows/buildlibdvd.sh index db99da3d82..0e983db94f 100644 --- a/tools/buildsteps/win32/buildlibdvd.sh +++ b/tools/buildsteps/windows/buildlibdvd.sh @@ -7,7 +7,7 @@ LIBDVDPREFIX=/xbmc/lib/libdvd PKG_CONFIG_PATH=$LIBDVDPREFIX/lib/pkgconfig export PKG_CONFIG_PATH -if [ "$(pathChanged $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/win32)" == "0" ] +if [ "$(pathChanged $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)" == "0" ] then cp "$LIBDVDPREFIX/bin/libdvdcss-2.dll" /xbmc/system/ cp $LIBDVDPREFIX/bin/libdvdnav.dll /xbmc/system/ @@ -75,7 +75,7 @@ gcc \ 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/win32 +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 diff --git a/tools/buildsteps/win32/fmpeg_options.txt b/tools/buildsteps/windows/fmpeg_options.txt index 891a79ed4d..891a79ed4d 100644 --- a/tools/buildsteps/win32/fmpeg_options.txt +++ b/tools/buildsteps/windows/fmpeg_options.txt diff --git a/tools/buildsteps/win32/make-mingwlibs.bat b/tools/buildsteps/windows/make-mingwlibs.bat index 0d94facd05..7ffddce294 100644 --- a/tools/buildsteps/win32/make-mingwlibs.bat +++ b/tools/buildsteps/windows/make-mingwlibs.bat @@ -2,7 +2,9 @@ SETLOCAL rem batch file to compile mingw libs via BuildSetup -SET WORKDIR=%base_dir% +PUSHD %~dp0\..\..\.. +SET WORKDIR=%CD% +POPD SET PROMPTLEVEL=prompt SET BUILDMODE=clean @@ -12,7 +14,7 @@ SET build64=no SET vcarch=x86 SET msys2=msys64 SET tools=mingw -FOR %%b in (%1, %2, %3) DO ( +FOR %%b in (%1, %2, %3, %4) DO ( IF %%b==noprompt SET PROMPTLEVEL=noprompt IF %%b==clean SET BUILDMODE=clean IF %%b==noclean SET BUILDMODE=noclean @@ -27,10 +29,6 @@ FOR %%b in (%1, %2, %3) DO ( rem set MSVC env call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %vcarch% || exit /b 1 -IF "%WORKDIR%"=="" ( - SET WORKDIR=%~dp0\..\..\.. -) - REM Prepend the msys and mingw paths onto %PATH% SET MSYS_INSTALL_PATH=%WORKDIR%\project\BuildDependencies\msys SET PATH=%MSYS_INSTALL_PATH%\mingw\bin;%MSYS_INSTALL_PATH%\bin;%PATH% @@ -46,7 +44,7 @@ rem compiles a bunch of mingw libs and not more IF %opt%==sh ( IF EXIST %WORKDIR%\project\BuildDependencies\%msys2%\usr\bin\sh.exe ( ECHO starting sh shell - %WORKDIR%\project\BuildDependencies\%msys2%\usr\bin\sh.exe --login -i /xbmc/tools/buildsteps/win32/make-mingwlibs.sh --prompt=%PROMPTLEVEL% --mode=%BUILDMODE% --build32=%build32% --build64=%build64% --tools=%tools% + %WORKDIR%\project\BuildDependencies\%msys2%\usr\bin\sh.exe --login -i /xbmc/tools/buildsteps/windows/make-mingwlibs.sh --prompt=%PROMPTLEVEL% --mode=%BUILDMODE% --build32=%build32% --build64=%build64% --tools=%tools% GOTO END ) ELSE ( GOTO ENDWITHERROR @@ -54,7 +52,7 @@ IF %opt%==sh ( ) IF EXIST %WORKDIR%\project\BuildDependencies\%msys2%\usr\bin\mintty.exe ( ECHO starting mintty shell - %WORKDIR%\project\BuildDependencies\%msys2%\usr\bin\mintty.exe -d -i /msys2.ico /usr/bin/bash --login /xbmc/tools/buildsteps/win32/make-mingwlibs.sh --prompt=%PROMPTLEVEL% --mode=%BUILDMODE% --build32=%build32% --build64=%build64% --tools=%tools% + %WORKDIR%\project\BuildDependencies\%msys2%\usr\bin\mintty.exe -d -i /msys2.ico /usr/bin/bash --login /xbmc/tools/buildsteps/windows/make-mingwlibs.sh --prompt=%PROMPTLEVEL% --mode=%BUILDMODE% --build32=%build32% --build64=%build64% --tools=%tools% GOTO END ) GOTO ENDWITHERROR diff --git a/tools/buildsteps/win32/make-mingwlibs.sh b/tools/buildsteps/windows/make-mingwlibs.sh index ee241c71d7..50470cd8d3 100644 --- a/tools/buildsteps/win32/make-mingwlibs.sh +++ b/tools/buildsteps/windows/make-mingwlibs.sh @@ -62,7 +62,7 @@ runBackgroundProcess() { buildProcess() { -cd /xbmc/tools/buildsteps/win32 +cd /xbmc/tools/buildsteps/windows # compile our mingw dlls echo "-------------------------------------------------------------------------------" diff --git a/tools/buildsteps/windows/win32/make-mingwlibs.bat b/tools/buildsteps/windows/win32/make-mingwlibs.bat new file mode 100644 index 0000000000..2c3bedcc88 --- /dev/null +++ b/tools/buildsteps/windows/win32/make-mingwlibs.bat @@ -0,0 +1,5 @@ +@ECHO OFF + +PUSHD %~dp0\.. +CALL make-mingwlibs.bat %* +POPD |