ref: bcfd9c97508531a81cc2f5d393edb9eb1b00ce79
parent: 27beada6d033f15726807f1353ee181ddf0f02e2
author: Gregor Jasny <[email protected]>
date: Tue May 23 05:30:44 EDT 2017
Add support for Visual Studio 2017 BUG=webm:1428 Change-Id: Iba98aef1159724d106cf39b94d7b69843d76cd48
--- a/README
+++ b/README
@@ -58,6 +58,7 @@
armv7-win32-vs11
armv7-win32-vs12
armv7-win32-vs14
+ armv7-win32-vs15
armv7s-darwin-gcc
armv8-linux-gcc
mips32-linux-gcc
@@ -85,6 +86,7 @@
x86-win32-vs11
x86-win32-vs12
x86-win32-vs14
+ x86-win32-vs15
x86_64-android-gcc
x86_64-darwin9-gcc
x86_64-darwin10-gcc
@@ -103,6 +105,7 @@
x86_64-win64-vs11
x86_64-win64-vs12
x86_64-win64-vs14
+ x86_64-win64-vs15
generic-gnu
The generic-gnu target, in conjunction with the CROSS environment variable,
--- a/build/make/gen_msvs_sln.sh
+++ b/build/make/gen_msvs_sln.sh
@@ -25,7 +25,7 @@
Options:
--help Print this message
--out=outfile Redirect output to a file
- --ver=version Version (7,8,9,10,11,12,14) of visual studio to generate for
+ --ver=version Version (7,8,9,10,11,12,14,15) of visual studio to generate for
--target=isa-os-cc Target specifier
EOF
exit 1
@@ -215,7 +215,7 @@
;;
--ver=*) vs_ver="$optval"
case $optval in
- 10|11|12|14)
+ 10|11|12|14|15)
;;
*) die Unrecognized Visual Studio Version in $opt
;;
@@ -242,6 +242,9 @@
;;
14) sln_vers="14.00"
sln_vers_str="Visual Studio 2015"
+ ;;
+ 15) sln_vers="15.00"
+ sln_vers_str="Visual Studio 2017"
;;
esac
sfx=vcxproj
--- a/build/make/gen_msvs_vcxproj.sh
+++ b/build/make/gen_msvs_vcxproj.sh
@@ -34,7 +34,7 @@
--name=project_name Name of the project (required)
--proj-guid=GUID GUID to use for the project
--module-def=filename File containing export definitions (for DLLs)
- --ver=version Version (10,11,12,14) of visual studio to generate for
+ --ver=version Version (10,11,12,14,15) of visual studio to generate for
--src-path-bare=dir Path to root of source tree
-Ipath/to/include Additional include directories
-DFLAG[=value] Preprocessor macros to define
@@ -168,7 +168,7 @@
--ver=*)
vs_ver="$optval"
case "$optval" in
- 10|11|12|14)
+ 10|11|12|14|15)
;;
*) die Unrecognized Visual Studio Version in $opt
;;
@@ -218,7 +218,7 @@
asm_use_custom_step=false
uses_asm=${uses_asm:-false} case "${vs_ver:-11}" in- 10|11|12|14)
+ 10|11|12|14|15)
asm_use_custom_step=$uses_asm
;;
esac
@@ -346,6 +346,9 @@
fi
if [ "$vs_ver" = "14" ]; then
tag_content PlatformToolset v140
+ fi
+ if [ "$vs_ver" = "15" ]; then
+ tag_content PlatformToolset v141
fi
tag_content CharacterSet Unicode
if [ "$config" = "Release" ]; then
--- a/configure
+++ b/configure
@@ -109,6 +109,7 @@
all_platforms="${all_platforms} armv7-win32-vs11" all_platforms="${all_platforms} armv7-win32-vs12" all_platforms="${all_platforms} armv7-win32-vs14"+all_platforms="${all_platforms} armv7-win32-vs15" all_platforms="${all_platforms} armv7s-darwin-gcc" all_platforms="${all_platforms} armv8-linux-gcc" all_platforms="${all_platforms} mips32-linux-gcc"@@ -138,6 +139,7 @@
all_platforms="${all_platforms} x86-win32-vs11" all_platforms="${all_platforms} x86-win32-vs12" all_platforms="${all_platforms} x86-win32-vs14"+all_platforms="${all_platforms} x86-win32-vs15" all_platforms="${all_platforms} x86_64-android-gcc" all_platforms="${all_platforms} x86_64-darwin9-gcc" all_platforms="${all_platforms} x86_64-darwin10-gcc"@@ -156,6 +158,7 @@
all_platforms="${all_platforms} x86_64-win64-vs11" all_platforms="${all_platforms} x86_64-win64-vs12" all_platforms="${all_platforms} x86_64-win64-vs14"+all_platforms="${all_platforms} x86_64-win64-vs15" all_platforms="${all_platforms} generic-gnu"# all_targets is a list of all targets that can be configured