[windows] BuildSetup.bat: use a platform-specific kodi-build directory

9 files changed, 13 insertions, 2 deletions

diff --git a/tools/buildsteps/windows/BuildSetup.bat b/tools/buildsteps/windows/BuildSetup.bat
index 4328b234f4..0c4487c9e3 100644
--- a/tools/buildsteps/windows/BuildSetup.bat
+++ b/tools/buildsteps/windows/BuildSetup.bat
@@ -63,7 +63,7 @@ FOR %%b in (%*) DO (
 
 SET PreferredToolArchitecture=x64
 SET buildconfig=Release
-set WORKSPACE=%base_dir%\kodi-build
+set WORKSPACE=%base_dir%\kodi-build.%TARGET_PLATFORM%
 
 
   :: sets the BRANCH env var
diff --git a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat
index 49bb5961e9..18b3ecf86c 100644
--- a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat
+++ b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat
@@ -11,6 +11,7 @@ IF ERRORLEVEL 1 (
 
 SET cmakeGenerator=Visual Studio %vsver% ARM
 SET TARGET_ARCHITECTURE=arm
+SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%-uwp
 SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion%
 
 CALL BuildSetup.bat %*
diff --git a/tools/buildsteps/windows/run-tests.bat b/tools/buildsteps/windows/run-tests.bat
index 04c2f3e7a3..04ff968365 100644
--- a/tools/buildsteps/windows/run-tests.bat
+++ b/tools/buildsteps/windows/run-tests.bat
@@ -5,7 +5,7 @@ REM setup all paths
 PUSHD %~dp0\..\..\..
 SET WORKSPACE=%CD%
 POPD
-cd %WORKSPACE%\kodi-build
+cd %WORKSPACE%\kodi-build.%TARGET_PLATFORM%
 SET builddeps_dir=%WORKSPACE%\project\BuildDependencies
 SET msys_dir=%builddeps_dir%\msys64
 IF NOT EXIST %msys_dir% (SET msys_dir=%builddeps_dir%\msys32)
diff --git a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat
index 545f0d7a48..3aba2378f1 100644
--- a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat
+++ b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat
@@ -10,6 +10,7 @@ IF ERRORLEVEL 1 (
 
 SET cmakeGenerator=Visual Studio %vsver%
 SET TARGET_ARCHITECTURE=x86
+SET TARGET_PLATFORM=win32-uwp
 SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion%
 
 CALL BuildSetup.bat %*
diff --git a/tools/buildsteps/windows/win32/BuildSetup.bat b/tools/buildsteps/windows/win32/BuildSetup.bat
index ecfb42ff76..70764985ba 100644
--- a/tools/buildsteps/windows/win32/BuildSetup.bat
+++ b/tools/buildsteps/windows/win32/BuildSetup.bat
@@ -11,6 +11,7 @@ IF ERRORLEVEL 1 (
 
 SET cmakeGenerator=Visual Studio %vsver%
 SET TARGET_ARCHITECTURE=x86
+SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%
 
 CALL BuildSetup.bat %*
 POPD
diff --git a/tools/buildsteps/windows/win32/run-tests.bat b/tools/buildsteps/windows/win32/run-tests.bat
index f93b85d1f4..4d811fd200 100644
--- a/tools/buildsteps/windows/win32/run-tests.bat
+++ b/tools/buildsteps/windows/win32/run-tests.bat
@@ -1,5 +1,8 @@
 @ECHO OFF
 
 PUSHD %~dp0\..
+
+SET TARGET_PLATFORM=x86
+
 CALL run-tests.bat
 POPD
diff --git a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat
index 8ef44c3ade..037c536b80 100644
--- a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat
+++ b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat
@@ -10,6 +10,7 @@ IF ERRORLEVEL 1 (
 
 SET cmakeGenerator=Visual Studio %vsver% Win64
 SET TARGET_ARCHITECTURE=x64
+SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%-uwp
 SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion%
 
 CALL BuildSetup.bat %*
diff --git a/tools/buildsteps/windows/x64/BuildSetup.bat b/tools/buildsteps/windows/x64/BuildSetup.bat
index 4ff91a8891..6434d3f0c0 100644
--- a/tools/buildsteps/windows/x64/BuildSetup.bat
+++ b/tools/buildsteps/windows/x64/BuildSetup.bat
@@ -10,6 +10,7 @@ IF ERRORLEVEL 1 (
 
 SET cmakeGenerator=Visual Studio %vsver% Win64
 SET TARGET_ARCHITECTURE=x64
+SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%
 
 CALL BuildSetup.bat %*
 POPD
diff --git a/tools/buildsteps/windows/x64/run-tests.bat b/tools/buildsteps/windows/x64/run-tests.bat
index f93b85d1f4..0c099b5268 100644
--- a/tools/buildsteps/windows/x64/run-tests.bat
+++ b/tools/buildsteps/windows/x64/run-tests.bat
@@ -1,5 +1,8 @@
 @ECHO OFF
 
 PUSHD %~dp0\..
+
+SET TARGET_PLATFORM=x64
+
 CALL run-tests.bat
 POPD