Commit ff5b2f43 authored by James Zern's avatar James Zern
Browse files

Add support for Visual Studio 2017

ported from libvpx:
bcfd9c975 Add support for Visual Studio 2017

Change-Id: I86c8848ce6626fa218a38bfbd3e39abb60420218
parent 69eab5cd
...@@ -59,6 +59,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -59,6 +59,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
armv7-none-rvct armv7-none-rvct
armv7-win32-vs12 armv7-win32-vs12
armv7-win32-vs14 armv7-win32-vs14
armv7-win32-vs15
armv7s-darwin-gcc armv7s-darwin-gcc
mips32-linux-gcc mips32-linux-gcc
mips64-linux-gcc mips64-linux-gcc
...@@ -83,6 +84,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -83,6 +84,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86-win32-gcc x86-win32-gcc
x86-win32-vs12 x86-win32-vs12
x86-win32-vs14 x86-win32-vs14
x86-win32-vs15
x86_64-android-gcc x86_64-android-gcc
x86_64-darwin9-gcc x86_64-darwin9-gcc
x86_64-darwin10-gcc x86_64-darwin10-gcc
...@@ -99,6 +101,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -99,6 +101,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86_64-win64-gcc x86_64-win64-gcc
x86_64-win64-vs12 x86_64-win64-vs12
x86_64-win64-vs14 x86_64-win64-vs14
x86_64-win64-vs15
generic-gnu generic-gnu
The generic-gnu target, in conjunction with the CROSS environment variable, The generic-gnu target, in conjunction with the CROSS environment variable,
......
...@@ -25,7 +25,7 @@ files. ...@@ -25,7 +25,7 @@ files.
Options: Options:
--help Print this message --help Print this message
--out=outfile Redirect output to a file --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 --target=isa-os-cc Target specifier
EOF EOF
exit 1 exit 1
...@@ -215,7 +215,7 @@ for opt in "$@"; do ...@@ -215,7 +215,7 @@ for opt in "$@"; do
;; ;;
--ver=*) vs_ver="$optval" --ver=*) vs_ver="$optval"
case $optval in case $optval in
12|14) 12|14|15)
;; ;;
*) die Unrecognized Visual Studio Version in $opt *) die Unrecognized Visual Studio Version in $opt
;; ;;
...@@ -234,9 +234,12 @@ case "${vs_ver:-12}" in ...@@ -234,9 +234,12 @@ case "${vs_ver:-12}" in
12) sln_vers="12.00" 12) sln_vers="12.00"
sln_vers_str="Visual Studio 2013" sln_vers_str="Visual Studio 2013"
;; ;;
14) sln_vers="14.00" 14) sln_vers="12.00"
sln_vers_str="Visual Studio 2015" sln_vers_str="Visual Studio 2015"
;; ;;
15) sln_vers="12.00"
sln_vers_str="Visual Studio 2017"
;;
esac esac
sfx=vcxproj sfx=vcxproj
......
...@@ -34,7 +34,7 @@ Options: ...@@ -34,7 +34,7 @@ Options:
--name=project_name Name of the project (required) --name=project_name Name of the project (required)
--proj-guid=GUID GUID to use for the project --proj-guid=GUID GUID to use for the project
--module-def=filename File containing export definitions (for DLLs) --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 --src-path-bare=dir Path to root of source tree
-Ipath/to/include Additional include directories -Ipath/to/include Additional include directories
-DFLAG[=value] Preprocessor macros to define -DFLAG[=value] Preprocessor macros to define
...@@ -168,7 +168,7 @@ for opt in "$@"; do ...@@ -168,7 +168,7 @@ for opt in "$@"; do
--ver=*) --ver=*)
vs_ver="$optval" vs_ver="$optval"
case "$optval" in case "$optval" in
12|14) 12|14|15)
;; ;;
*) die Unrecognized Visual Studio Version in $opt *) die Unrecognized Visual Studio Version in $opt
;; ;;
...@@ -218,7 +218,7 @@ guid=${guid:-`generate_uuid`} ...@@ -218,7 +218,7 @@ guid=${guid:-`generate_uuid`}
asm_use_custom_step=false asm_use_custom_step=false
uses_asm=${uses_asm:-false} uses_asm=${uses_asm:-false}
case "${vs_ver:-12}" in case "${vs_ver:-12}" in
12|14) 12|14|15)
asm_use_custom_step=$uses_asm asm_use_custom_step=$uses_asm
;; ;;
esac esac
...@@ -333,6 +333,9 @@ generate_vcxproj() { ...@@ -333,6 +333,9 @@ generate_vcxproj() {
if [ "$vs_ver" = "14" ]; then if [ "$vs_ver" = "14" ]; then
tag_content PlatformToolset v140 tag_content PlatformToolset v140
fi fi
if [ "$vs_ver" = "15" ]; then
tag_content PlatformToolset v141
fi
tag_content CharacterSet Unicode tag_content CharacterSet Unicode
if [ "$config" = "Release" ]; then if [ "$config" = "Release" ]; then
tag_content WholeProgramOptimization true tag_content WholeProgramOptimization true
......
...@@ -102,6 +102,7 @@ all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 ...@@ -102,6 +102,7 @@ all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8
all_platforms="${all_platforms} armv7-win32-vs12" all_platforms="${all_platforms} armv7-win32-vs12"
all_platforms="${all_platforms} armv7-win32-vs14" 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} armv7s-darwin-gcc"
all_platforms="${all_platforms} armv8-linux-gcc" all_platforms="${all_platforms} armv8-linux-gcc"
all_platforms="${all_platforms} mips32-linux-gcc" all_platforms="${all_platforms} mips32-linux-gcc"
...@@ -127,6 +128,7 @@ all_platforms="${all_platforms} x86-solaris-gcc" ...@@ -127,6 +128,7 @@ all_platforms="${all_platforms} x86-solaris-gcc"
all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-gcc"
all_platforms="${all_platforms} x86-win32-vs12" all_platforms="${all_platforms} x86-win32-vs12"
all_platforms="${all_platforms} x86-win32-vs14" 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-android-gcc"
all_platforms="${all_platforms} x86_64-darwin9-gcc" all_platforms="${all_platforms} x86_64-darwin9-gcc"
all_platforms="${all_platforms} x86_64-darwin10-gcc" all_platforms="${all_platforms} x86_64-darwin10-gcc"
...@@ -143,6 +145,7 @@ all_platforms="${all_platforms} x86_64-solaris-gcc" ...@@ -143,6 +145,7 @@ all_platforms="${all_platforms} x86_64-solaris-gcc"
all_platforms="${all_platforms} x86_64-win64-gcc" all_platforms="${all_platforms} x86_64-win64-gcc"
all_platforms="${all_platforms} x86_64-win64-vs12" all_platforms="${all_platforms} x86_64-win64-vs12"
all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs14"
all_platforms="${all_platforms} x86_64-win64-vs15"
all_platforms="${all_platforms} generic-gnu" all_platforms="${all_platforms} generic-gnu"
# all_targets is a list of all targets that can be configured # all_targets is a list of all targets that can be configured
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment