diff options
| author | Ghislain MARY <ghislainmary2@gmail.com> | 2015-07-28 16:37:09 +0200 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-08-05 14:45:16 -0700 |
| commit | 3067c34c5ae5ea94fc4b059a26c385408912e9ce (patch) | |
| tree | aaf7a3cad9629dac1fb97321626b3f8f0610e2db /build | |
| parent | 23591322cfe8f9e88d150ff737e0773293012f32 (diff) | |
| download | libvpx-3067c34c5ae5ea94fc4b059a26c385408912e9ce.tar libvpx-3067c34c5ae5ea94fc4b059a26c385408912e9ce.tar.gz libvpx-3067c34c5ae5ea94fc4b059a26c385408912e9ce.tar.bz2 libvpx-3067c34c5ae5ea94fc4b059a26c385408912e9ce.zip | |
Support build with Visual Studio 14.
Change-Id: Id0d7c19857e29b66c652c8cc1ab56b64e4fc0fa3
Diffstat (limited to 'build')
| -rwxr-xr-x | build/make/gen_msvs_sln.sh | 11 | ||||
| -rwxr-xr-x | build/make/gen_msvs_vcxproj.sh | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh index ffa370666..664b404c9 100755 --- a/build/make/gen_msvs_sln.sh +++ b/build/make/gen_msvs_sln.sh @@ -19,13 +19,13 @@ show_help() { cat <<EOF Usage: ${self_basename} [options] file1 [file2 ...] -This script generates a Visual Studio 2005 solution file from a list of project +This script generates a Visual Studio solution file from a list of project files. Options: --help Print this message --out=outfile Redirect output to a file - --ver=version Version (7,8,9,10,11) of visual studio to generate for + --ver=version Version (7,8,9,10,11,12,14) of visual studio to generate for --target=isa-os-cc Target specifier EOF exit 1 @@ -255,7 +255,7 @@ for opt in "$@"; do ;; --ver=*) vs_ver="$optval" case $optval in - [789]|10|11|12) + [789]|10|11|12|14) ;; *) die Unrecognized Visual Studio Version in $opt ;; @@ -300,12 +300,15 @@ case "${vs_ver:-8}" in 12) sln_vers="12.00" sln_vers_str="Visual Studio 2013" ;; + 14) sln_vers="14.00" + sln_vers_str="Visual Studio 2015" + ;; esac case "${vs_ver:-8}" in [789]) sfx=vcproj ;; - 10|11|12) + 10|11|12|14) sfx=vcxproj ;; esac diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index b65365103..182ea28fa 100755 --- a/build/make/gen_msvs_vcxproj.sh +++ b/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 (10,11,12) of visual studio to generate for + --ver=version Version (10,11,12,14) 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 - 10|11|12) + 10|11|12|14) ;; *) 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:-11}" in - 10|11|12) + 10|11|12|14) asm_use_custom_step=$uses_asm ;; esac @@ -344,6 +344,9 @@ generate_vcxproj() { # has to enable AppContainerApplication as well. tag_content PlatformToolset v120 fi + if [ "$vs_ver" = "14" ]; then + tag_content PlatformToolset v140 + fi tag_content CharacterSet Unicode if [ "$config" = "Release" ]; then tag_content WholeProgramOptimization true |