diff options
Diffstat (limited to 'third_party/aom/build/make')
| -rwxr-xr-x | third_party/aom/build/make/gen_msvs_sln.sh | 9 | ||||
| -rwxr-xr-x | third_party/aom/build/make/gen_msvs_vcxproj.sh | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/third_party/aom/build/make/gen_msvs_sln.sh b/third_party/aom/build/make/gen_msvs_sln.sh index 77c68f1da..268a81706 100755 --- a/third_party/aom/build/make/gen_msvs_sln.sh +++ b/third_party/aom/build/make/gen_msvs_sln.sh @@ -25,7 +25,7 @@ files. Options: --help Print this message --out=outfile Redirect output to a file - --ver=version Version (12,14) of visual studio to generate for + --ver=version Version (12,14,15) of visual studio to generate for --target=isa-os-cc Target specifier EOF exit 1 @@ -215,7 +215,7 @@ for opt in "$@"; do ;; --ver=*) vs_ver="$optval" case $optval in - 12|14) + 12|14|15) ;; *) die Unrecognized Visual Studio Version in $opt ;; @@ -234,9 +234,12 @@ case "${vs_ver:-12}" in 12) sln_vers="12.00" sln_vers_str="Visual Studio 2013" ;; - 14) sln_vers="14.00" + 14) sln_vers="12.00" sln_vers_str="Visual Studio 2015" ;; + 15) sln_vers="12.00" + sln_vers_str="Visual Studio 2017" + ;; esac sfx=vcxproj diff --git a/third_party/aom/build/make/gen_msvs_vcxproj.sh b/third_party/aom/build/make/gen_msvs_vcxproj.sh index 7543bda17..a119b07aa 100755 --- a/third_party/aom/build/make/gen_msvs_vcxproj.sh +++ b/third_party/aom/build/make/gen_msvs_vcxproj.sh @@ -34,7 +34,7 @@ Options: --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 (12,14) of visual studio to generate for + --ver=version Version (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 @@ for opt in "$@"; do --ver=*) vs_ver="$optval" case "$optval" in - 12|14) + 12|14|15) ;; *) die Unrecognized Visual Studio Version in $opt ;; @@ -218,7 +218,7 @@ guid=${guid:-`generate_uuid`} asm_use_custom_step=false uses_asm=${uses_asm:-false} case "${vs_ver:-12}" in - 12|14) + 12|14|15) asm_use_custom_step=$uses_asm ;; esac @@ -333,6 +333,9 @@ generate_vcxproj() { 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 tag_content WholeProgramOptimization true |