diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | tools/buildsteps/windows/download-msys2.bat | 6 | ||||
| -rw-r--r-- | tools/buildsteps/windows/make-mingwlibs.sh | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 64eee333f0..a4185f0448 100644 --- a/.gitignore +++ b/.gitignore @@ -232,7 +232,6 @@ lib/cpluff/stamp-h1 /project/Win32BuildSetup/dependencies/ # /project/BuildDependencies -/project/BuildDependencies/arm-uwp /project/BuildDependencies/downloads /project/BuildDependencies/downloads2 /project/BuildDependencies/msys32 @@ -246,9 +245,10 @@ lib/cpluff/stamp-h1 /project/BuildDependencies/bin/json-rpc /project/BuildDependencies/mingwlibs /project/BuildDependencies/x64 -/project/BuildDependencies/x64-uwp +/project/BuildDependencies/win10-arm +/project/BuildDependencies/win10-x64 +/project/BuildDependencies/win10-win32 /project/BuildDependencies/win32 -/project/BuildDependencies/win32-uwp # /system/players/VideoPlayer /system/players/VideoPlayer/* diff --git a/tools/buildsteps/windows/download-msys2.bat b/tools/buildsteps/windows/download-msys2.bat index cb451a6384..09ba5d4d80 100644 --- a/tools/buildsteps/windows/download-msys2.bat +++ b/tools/buildsteps/windows/download-msys2.bat @@ -262,9 +262,9 @@ if "%searchRes%"=="local64" GOTO installbase echo.%instdir%\downloads2\ /var/cache/pacman/pkg echo.%instdir%\win32\ /depends/win32 echo.%instdir%\x64\ /depends/x64 - echo.%instdir%\arm-uwp\ /depends/arm-uwp - echo.%instdir%\win32-uwp\ /depends/win32-uwp - echo.%instdir%\x64-uwp\ /depends/x64-uwp + echo.%instdir%\win10-arm\ /depends/win10-arm + echo.%instdir%\win10-win32\ /depends/win10-win32 + echo.%instdir%\win10-x64\ /depends/win10-x64 echo.%instdir%\..\..\ /xbmc )>>%instdir%\%msys2%\etc\fstab. diff --git a/tools/buildsteps/windows/make-mingwlibs.sh b/tools/buildsteps/windows/make-mingwlibs.sh index 49ede9e9d6..73a3d83795 100644 --- a/tools/buildsteps/windows/make-mingwlibs.sh +++ b/tools/buildsteps/windows/make-mingwlibs.sh @@ -51,7 +51,7 @@ if [[ $win10 = "no" ]]; then export _WIN32_WINNT=0x0600 export NTDDI_VERSION=0x06000000 elif [[ $win10 = "yes" ]]; then - TRIPLET=$TRIPLET-uwp + TRIPLET=win10-$TRIPLET fi export TRIPLET ARCH TOOLS |