diff options
| author | fuzzard <fuzzard@kodi.tv> | 2024-06-03 13:56:56 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2024-06-17 12:47:41 +1000 |
| commit | 6f766bb4d6cd4cf165ff80b17ec030e88fc7b4b9 (patch) | |
| tree | ab62d40ac663eb2a6c392f6e78c25cd7dd4185de /tools/buildsteps | |
| parent | 74b6dd9074f5a0dd3ddd85abf92c5e29e15edaf0 (diff) | |
[windows] Split target platform from build tools folder location
We currently use the same folder for win32 target arch, and for the native build tools
extraction folder. We need to avoid NATIVEPREFIX being the same as DEPENDS_PATH.
For now, we can just locate the build tools to an non specific arch folder
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/windows/download-dependencies.bat | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/buildsteps/windows/download-dependencies.bat b/tools/buildsteps/windows/download-dependencies.bat index 697c616751..6a509c3eee 100644 --- a/tools/buildsteps/windows/download-dependencies.bat +++ b/tools/buildsteps/windows/download-dependencies.bat @@ -9,6 +9,10 @@ POPD SET TARGETPLATFORM=%1 SET NATIVEPLATFORM=%2 +REM Build tools location. We may want to add an extra folder for HOST ARCH +REM if we want end up having build tools other than win32 arch +SET HOST_BUILDTOOLS=tools + IF "%TARGETPLATFORM%" == "" SET TARGETPLATFORM=win32 IF "%NATIVEPLATFORM%" == "" SET NATIVEPLATFORM=win32 @@ -22,7 +26,7 @@ echo Downloading from mirror %KODI_MIRROR% REM Locate the BuildDependencies directory, based on the path of this script SET BUILD_DEPS_PATH=%WORKSPACE%\project\BuildDependencies SET APP_PATH=%WORKSPACE%\project\BuildDependencies\%TARGETPLATFORM% -SET NATIVE_PATH=%WORKSPACE%\project\BuildDependencies\%NATIVEPLATFORM% +SET NATIVE_PATH=%WORKSPACE%\project\BuildDependencies\%HOST_BUILDTOOLS% SET TMP_PATH=%BUILD_DEPS_PATH%\scripts\tmp REM Change to the BuildDependencies directory, if we're not there already |