summaryrefslogtreecommitdiffstats
path: root/third_party/aom/build/make
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-18 06:04:57 -0500
committertrav90 <travawine@palemoon.org>2018-10-18 06:04:57 -0500
commit7369c7d7a5eed32963d8af37658286617919f91c (patch)
tree5397ce7ee9bca1641118fdc3187bd9e2b24fdc9c /third_party/aom/build/make
parent77887af9c4ad1420bbdb33984af4f74b55ca59db (diff)
downloadUXP-7369c7d7a5eed32963d8af37658286617919f91c.tar
UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.gz
UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.lz
UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.xz
UXP-7369c7d7a5eed32963d8af37658286617919f91c.zip
Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918
Diffstat (limited to 'third_party/aom/build/make')
-rwxr-xr-xthird_party/aom/build/make/gen_msvs_sln.sh9
-rwxr-xr-xthird_party/aom/build/make/gen_msvs_vcxproj.sh9
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