diff options
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | build/make/gen_msvs_sln.sh | 5 | ||||
| -rwxr-xr-x | build/make/gen_msvs_vcxproj.sh | 7 | ||||
| -rwxr-xr-x | configure | 2 |
4 files changed, 12 insertions, 4 deletions
@@ -100,6 +100,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: x86-win32-gcc x86-win32-vs14 x86-win32-vs15 + x86-win32-vs16 x86_64-android-gcc x86_64-darwin9-gcc x86_64-darwin10-gcc @@ -118,6 +119,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: x86_64-win64-gcc x86_64-win64-vs14 x86_64-win64-vs15 + x86_64-win64-vs16 generic-gnu The generic-gnu target, in conjunction with the CROSS environment variable, diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh index da27fc474..d1adfd749 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 (14,15) of visual studio to generate for + --ver=version Version (14-16) of visual studio to generate for --target=isa-os-cc Target specifier EOF exit 1 @@ -218,6 +218,7 @@ for opt in "$@"; do case $optval in 14) vs_year=2015 ;; 15) vs_year=2017 ;; + 16) vs_year=2019 ;; *) die Unrecognized Visual Studio Version in $opt ;; esac ;; @@ -231,7 +232,7 @@ done outfile=${outfile:-/dev/stdout} mkoutfile=${mkoutfile:-/dev/stdout} case "${vs_ver}" in - 1[4-5]) + 1[4-6]) # VS has used Format Version 12.00 continuously since vs11. sln_vers="12.00" sln_vers_str="Visual Studio ${vs_year}" diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index bddabee6b..bb1c31d23 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 (14,15) of visual studio to generate for + --ver=version Version (14-16) 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 - 1[4-5]) + 1[4-6]) ;; *) die Unrecognized Visual Studio Version in $opt ;; @@ -339,6 +339,9 @@ generate_vcxproj() { if [ "$vs_ver" = "15" ]; then tag_content PlatformToolset v141 fi + if [ "$vs_ver" = "16" ]; then + tag_content PlatformToolset v142 + fi tag_content CharacterSet Unicode if [ "$config" = "Release" ]; then tag_content WholeProgramOptimization true @@ -137,6 +137,7 @@ all_platforms="${all_platforms} x86-solaris-gcc" all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" +all_platforms="${all_platforms} x86-win32-vs16" all_platforms="${all_platforms} x86_64-android-gcc" all_platforms="${all_platforms} x86_64-darwin9-gcc" all_platforms="${all_platforms} x86_64-darwin10-gcc" @@ -155,6 +156,7 @@ all_platforms="${all_platforms} x86_64-solaris-gcc" all_platforms="${all_platforms} x86_64-win64-gcc" all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs15" +all_platforms="${all_platforms} x86_64-win64-vs16" all_platforms="${all_platforms} generic-gnu" # all_targets is a list of all targets that can be configured |