diff options
| -rw-r--r-- | tools/buildsteps/windows/download-dependencies.bat (renamed from project/BuildDependencies/DownloadBuildDeps.bat) | 8 | ||||
| -rw-r--r-- | tools/buildsteps/windows/download-msys2.bat (renamed from project/BuildDependencies/DownloadMingwBuildEnv.bat) | 6 | ||||
| -rw-r--r-- | tools/buildsteps/windows/win32/download-dependencies.bat | 5 | ||||
| -rw-r--r-- | tools/buildsteps/windows/win32/download-msys2.bat | 5 |
4 files changed, 21 insertions, 3 deletions
diff --git a/project/BuildDependencies/DownloadBuildDeps.bat b/tools/buildsteps/windows/download-dependencies.bat index 966a61272d..ad03644759 100644 --- a/project/BuildDependencies/DownloadBuildDeps.bat +++ b/tools/buildsteps/windows/download-dependencies.bat @@ -2,6 +2,10 @@ SETLOCAL +PUSHD %~dp0\..\..\.. +SET WORKSPACE=%CD% +POPD + SET TARGETPLATFORM=%1 SET NATIVEPLATFORM=%2 @@ -16,8 +20,8 @@ IF "%KODI_MIRROR%" == "" SET KODI_MIRROR=http://mirrors.kodi.tv echo Downloading from mirror %KODI_MIRROR% REM Locate the BuildDependencies directory, based on the path of this script -SET BUILD_DEPS_PATH=%~dp0 -SET APP_PATH=%BUILD_DEPS_PATH%\..\.. +SET BUILD_DEPS_PATH=%WORKSPACE%\project\BuildDependencies +SET APP_PATH=%WORKSPACE% SET TMP_PATH=%BUILD_DEPS_PATH%\scripts\tmp REM Change to the BuildDependencies directory, if we're not there already diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/tools/buildsteps/windows/download-msys2.bat index 6f168013dd..ba2d0fa06a 100644 --- a/project/BuildDependencies/DownloadMingwBuildEnv.bat +++ b/tools/buildsteps/windows/download-msys2.bat @@ -22,11 +22,15 @@ @echo off title msys2 +PUSHD %~dp0\..\..\.. +SET WORKSPACE=%CD% +POPD + set msysver=20160205 set msys2=msys64 set build32=yes set build64=no -set instdir=%CD% +set instdir=%WORKSPACE%\project\BuildDependencies set msyspackages=autoconf automake libtool m4 make gettext patch pkg-config wget p7zip coreutils set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm nettle libtasn1 openssl xz set locals32=gnutls-3.4.14-static diff --git a/tools/buildsteps/windows/win32/download-dependencies.bat b/tools/buildsteps/windows/win32/download-dependencies.bat new file mode 100644 index 0000000000..ecb5897707 --- /dev/null +++ b/tools/buildsteps/windows/win32/download-dependencies.bat @@ -0,0 +1,5 @@ +@ECHO OFF + +PUSHD %~dp0\.. +CALL download-dependencies.bat win32 +POPD diff --git a/tools/buildsteps/windows/win32/download-msys2.bat b/tools/buildsteps/windows/win32/download-msys2.bat new file mode 100644 index 0000000000..8c041bae58 --- /dev/null +++ b/tools/buildsteps/windows/win32/download-msys2.bat @@ -0,0 +1,5 @@ +@ECHO OFF + +PUSHD %~dp0\.. +CALL download-msys2.bat %* +POPD |