diff options
Diffstat (limited to 'build/make')
| -rwxr-xr-x | build/make/gen_msvs_sln.sh | 36 | ||||
| -rwxr-xr-x | build/make/gen_msvs_vcxproj.sh | 32 |
2 files changed, 16 insertions, 52 deletions
diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh index 401223a0b..da27fc474 100755 --- a/build/make/gen_msvs_sln.sh +++ b/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 (7,8,9,10,11,12,14,15) of visual studio to generate for + --ver=version Version (14,15) of visual studio to generate for --target=isa-os-cc Target specifier EOF exit 1 @@ -213,13 +213,13 @@ for opt in "$@"; do ;; --dep=*) eval "${optval%%:*}_deps=\"\${${optval%%:*}_deps} ${optval##*:}\"" ;; - --ver=*) vs_ver="$optval" - case $optval in - 10|11|12|14|15) - ;; - *) die Unrecognized Visual Studio Version in $opt - ;; - esac + --ver=*) + vs_ver="$optval" + case $optval in + 14) vs_year=2015 ;; + 15) vs_year=2017 ;; + *) die Unrecognized Visual Studio Version in $opt ;; + esac ;; --target=*) target="${optval}" ;; @@ -230,21 +230,11 @@ for opt in "$@"; do done outfile=${outfile:-/dev/stdout} mkoutfile=${mkoutfile:-/dev/stdout} -case "${vs_ver:-10}" in - 10) sln_vers="11.00" - sln_vers_str="Visual Studio 2010" - ;; - 11) sln_vers="12.00" - sln_vers_str="Visual Studio 2012" - ;; - 12) sln_vers="12.00" - sln_vers_str="Visual Studio 2013" - ;; - 14) sln_vers="12.00" - sln_vers_str="Visual Studio 2015" - ;; - 15) sln_vers="12.00" - sln_vers_str="Visual Studio 2017" +case "${vs_ver}" in + 1[4-5]) + # VS has used Format Version 12.00 continuously since vs11. + sln_vers="12.00" + sln_vers_str="Visual Studio ${vs_year}" ;; esac sfx=vcxproj diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index 84515ecff..bddabee6b 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,14,15) of visual studio to generate for + --ver=version Version (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 @@ -82,7 +82,7 @@ generate_filter() { | sed -e "s,$src_path_bare,," \ -e 's/^[\./]\+//g' -e 's,[:/ ],_,g') - if ([ "$pat" == "asm" ] || [ "$pat" == "s" ] || [ "$pat" == "S" ]) && $asm_use_custom_step; then + if ([ "$pat" == "asm" ] || [ "$pat" == "s" ] || [ "$pat" == "S" ]) && $uses_asm; then # Avoid object file name collisions, i.e. vpx_config.c and # vpx_config.asm produce the same object file without # this additional suffix. @@ -168,7 +168,7 @@ for opt in "$@"; do --ver=*) vs_ver="$optval" case "$optval" in - 10|11|12|14|15) + 1[4-5]) ;; *) die Unrecognized Visual Studio Version in $opt ;; @@ -215,13 +215,7 @@ fix_file_list file_list outfile=${outfile:-/dev/stdout} guid=${guid:-`generate_uuid`} -asm_use_custom_step=false uses_asm=${uses_asm:-false} -case "${vs_ver:-11}" in - 10|11|12|14|15) - asm_use_custom_step=$uses_asm - ;; -esac [ -n "$name" ] || die "Project name (--name) must be specified!" [ -n "$target" ] || die "Target (--target) must be specified!" @@ -339,26 +333,6 @@ generate_vcxproj() { else tag_content ConfigurationType StaticLibrary fi - if [ "$vs_ver" = "11" ]; then - if [ "$plat" = "ARM" ]; then - # Setting the wp80 toolchain automatically sets the - # WINAPI_FAMILY define, which is required for building - # code for arm with the windows headers. Alternatively, - # one could add AppContainerApplication=true in the Globals - # section and add PrecompiledHeader=NotUsing and - # CompileAsWinRT=false in ClCompile and SubSystem=Console - # in Link. - tag_content PlatformToolset v110_wp80 - else - tag_content PlatformToolset v110 - fi - fi - if [ "$vs_ver" = "12" ]; then - # Setting a PlatformToolset indicating windows phone isn't - # enough to build code for arm with MSVC 2013, one strictly - # has to enable AppContainerApplication as well. - tag_content PlatformToolset v120 - fi if [ "$vs_ver" = "14" ]; then tag_content PlatformToolset v140 fi |