[windows] DownloadBuildDeps: add parameters for target & native platform

4 files changed, 25 insertions, 8 deletions

diff --git a/project/BuildDependencies/DownloadBuildDeps.bat b/project/BuildDependencies/DownloadBuildDeps.bat
index 331784ca09..966a61272d 100644
--- a/project/BuildDependencies/DownloadBuildDeps.bat
+++ b/project/BuildDependencies/DownloadBuildDeps.bat
@@ -2,6 +2,15 @@
 
 SETLOCAL
 
+SET TARGETPLATFORM=%1
+SET NATIVEPLATFORM=%2
+
+IF "%TARGETPLATFORM%" == "" SET TARGETPLATFORM=win32
+IF "%NATIVEPLATFORM%" == "" SET NATIVEPLATFORM=win32
+
+ECHO TARGETPLATFORM: %TARGETPLATFORM%
+ECHO NATIVEPLATFORM: %NATIVEPLATFORM%
+
 REM If KODI_MIRROR is not set externally to this script, set it to the default mirror URL
 IF "%KODI_MIRROR%" == "" SET KODI_MIRROR=http://mirrors.kodi.tv
 echo Downloading from mirror %KODI_MIRROR%
diff --git a/project/BuildDependencies/scripts/0_package.native-win32.list b/project/BuildDependencies/scripts/0_package.native-win32.list
new file mode 100644
index 0000000000..e37fa5b74f
--- /dev/null
+++ b/project/BuildDependencies/scripts/0_package.native-win32.list
@@ -0,0 +1,11 @@
+; package.list should contain all file names of packages which are already in the "new" package format (the package contains the paths to the libraries
+; and headers relative to the XBMC root directory, stored in a zip container)
+; example sqlite-3.7.12.1-win32.7z:
+; -> (package name)\(relative path to file)
+; -> sqlite-3.7.12.1-win32\project\BuildDependencies\lib\sqlite3.lib
+; -> sqlite-3.7.12.1-win32\system\sqlite3.dll
+; -> ...
+;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
+doxygen-1.8.2-win32.7z
+jsonschemabuilder-1.0.0-win32-3.7z
+texturepacker-1.1.1-win32.7z
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.target-win32.list
index a71ff77a58..69ae3dffc3 100644
--- a/project/BuildDependencies/scripts/0_package.list
+++ b/project/BuildDependencies/scripts/0_package.target-win32.list
@@ -10,13 +10,11 @@ cpluff-ed7874fc-win32-vc140.7z
 crossguid-8f399e-win32-vc140-v3.7z
 curl-7.48-win32-vc140.7z
 dnssd-541-win32.zip
-doxygen-1.8.2-win32.7z
 easyhook-2.7.5870.0-win32-vc140-v2.7z
 expat-2.2.0-win32-vc140.7z
 fmt-3.0.1-win32-vc140.7z
 freetype-db5a22-win32-vc140.7z
 giflib-5.1.4-win32-vc140.7z
-jsonschemabuilder-1.0.0-win32-3.7z
 libass-ddb383-win32-vc140.7z
 libbluray-0.9.3-win32-vc140.7z
 libcdio-0.9.3-win32-vc140.7z
@@ -44,6 +42,5 @@ shairplay-0.9.0-win32-vc140-v2.7z
 sqlite-3.10.2-win32-vc140.7z
 swig-3.0.10-win32.7z
 taglib-1.11.1_80df30-win32-vc140.7z
-texturepacker-1.1.1-win32.7z
 tinyxmlstl-2.6.2-win32-vc140-v2.7z
 zlib-1.2.8-win32-vc140-v3.7z
diff --git a/project/BuildDependencies/scripts/get_formed.cmd b/project/BuildDependencies/scripts/get_formed.cmd
index d6c559351e..9aa21af6d1 100644
--- a/project/BuildDependencies/scripts/get_formed.cmd
+++ b/project/BuildDependencies/scripts/get_formed.cmd
@@ -6,10 +6,10 @@ REM So that we can expand variables inside of IF and FOR
 SETLOCAL enableDelayedExpansion
 
 REM Check presence of required file
-dir 0_package.list >NUL 2>NUL || (
-ECHO 0_package.list not found!
-ECHO Aborting...
-EXIT /B 20
+dir 0_package.native-%NATIVEPLATFORM%.list >NUL 2>NUL && dir 0_package.target-%TARGETPLATFORM%.list >NUL 2>NUL || (
+  ECHO 0_package.native-%NATIVEPLATFORM%.list or 0_package.target-%TARGETPLATFORM%.list not found!
+  ECHO Aborting...
+  EXIT /B 20
 )
 
 REM Clear succeed flag
@@ -31,7 +31,7 @@ echo Downloading from mirror %KODI_MIRROR%
 CALL :setStageName Starting downloads of formed packages...
 SET SCRIPT_PATH=%CD%
 CD %DL_PATH% || EXIT /B 10
-FOR /F "eol=; tokens=1" %%f IN (%SCRIPT_PATH%\0_package.list) DO (
+FOR /F "eol=; tokens=1" %%f IN (%SCRIPT_PATH%\0_package.native-%NATIVEPLATFORM%.list %SCRIPT_PATH%\0_package.target-%TARGETPLATFORM%.list) DO (
   CALL :processFile %%f
 )