From 7369c7d7a5eed32963d8af37658286617919f91c Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 06:04:57 -0500 Subject: Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918 --- third_party/aom/build/make/gen_msvs_vcxproj.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'third_party/aom/build/make/gen_msvs_vcxproj.sh') 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 -- cgit v1.2.3