build-scripts/winrtbuild.ps1
changeset 9935 93fd2ca0ed98
parent 9735 35d8f8976d32
child 9940 f2d5ed0d9686
equal deleted inserted replaced
9934:0172d5616a83 9935:93fd2ca0ed98
    57         return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
    57         return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
    58     }
    58     }
    59     if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013
    59     if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013
    60         return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
    60         return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
    61     }
    61     }
       
    62     if ($PlatformToolset -eq "v140") {      # Windows 10, via VS 2015
       
    63         return "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
       
    64     }
    62     return ""
    65     return ""
    63 }
    66 }
    64 
    67 
    65 # Gets a string that identifies the build-variant of SDL/WinRT that is specific
    68 # Gets a string that identifies the build-variant of SDL/WinRT that is specific
    66 # to a particular Visual Studio PlatformToolset.
    69 # to a particular Visual Studio PlatformToolset.
    98     if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013 project files
   101     if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013 project files
    99         if ($IncludeVSSuffix) {
   102         if ($IncludeVSSuffix) {
   100             return "WinPhone81_VS2013"
   103             return "WinPhone81_VS2013"
   101         } else {
   104         } else {
   102             return "WinPhone81"
   105             return "WinPhone81"
       
   106         }
       
   107     }
       
   108     if ($PlatformToolset -eq "v140") {      # Windows 10, via VS 2015 project files
       
   109         if ($IncludeVSSuffix) {
       
   110             return "UWP_VS2015"
       
   111         } else {
       
   112             return "UWP"
   103         }
   113         }
   104     }
   114     }
   105     return ""
   115     return ""
   106 }
   116 }
   107 
   117 
   213 
   223 
   214 # Build for Windows 8.1 and Windows RT 8.1, via VC++ 2013:
   224 # Build for Windows 8.1 and Windows RT 8.1, via VC++ 2013:
   215 if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "ARM"))        { $DidAnyFail = $true }
   225 if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "ARM"))        { $DidAnyFail = $true }
   216 if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "Win32"))      { $DidAnyFail = $true }
   226 if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "Win32"))      { $DidAnyFail = $true }
   217 if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "x64"))        { $DidAnyFail = $true }
   227 if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "x64"))        { $DidAnyFail = $true }
       
   228 
       
   229 # Build for Windows 10, via VC++ 2015
       
   230 if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "ARM"))        { $DidAnyFail = $true }
       
   231 if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "Win32"))      { $DidAnyFail = $true }
       
   232 if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "x64"))        { $DidAnyFail = $true }
   218 
   233 
   219 # Let the script's caller know whether or not any errors occurred.
   234 # Let the script's caller know whether or not any errors occurred.
   220 # Exit codes compatible with Buildbot are used (1 for error, 0 for success).
   235 # Exit codes compatible with Buildbot are used (1 for error, 0 for success).
   221 if ($DidAnyFail -eq $true) {
   236 if ($DidAnyFail -eq $true) {
   222     exit 1
   237     exit 1