Unified · Split
| @@ -100,6 +100,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: · 99 unmodified lines | ||
| 100 | 100 | x86-win32-gcc |
| 101 | 101 | x86-win32-vs14 |
| 102 | 102 | x86-win32-vs15 |
| 103 | + x86-win32-vs16 | |
| 103 | 104 | x86_64-android-gcc |
| 104 | 105 | x86_64-darwin9-gcc |
| 105 | 106 | x86_64-darwin10-gcc |
| @@ -118,6 +119,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: · 12 unmodified lines | ||
| 118 | 119 | x86_64-win64-gcc |
| 119 | 120 | x86_64-win64-vs14 |
| 120 | 121 | x86_64-win64-vs15 |
| 122 | + x86_64-win64-vs16 | |
| 121 | 123 | generic-gnu |
| 122 | 124 | |
| 123 | 125 | The generic-gnu target, in conjunction with the CROSS environment variable, |
| @@ -25,7 +25,7 @@ files. · 24 unmodified lines | ||
| 25 | 25 | Options: |
| 26 | 26 | --help Print this message |
| 27 | 27 | --out=outfile Redirect output to a file |
| 28 | − --ver=version Version (14,15) of visual studio to generate for | |
| 28 | + --ver=version Version (14-16) of visual studio to generate for | |
| 29 | 29 | --target=isa-os-cc Target specifier |
| 30 | 30 | EOF |
| 31 | 31 | exit 1 |
| @@ -218,6 +218,7 @@ for opt in "$@"; do · 186 unmodified lines | ||
| 218 | 218 | case $optval in |
| 219 | 219 | 14) vs_year=2015 ;; |
| 220 | 220 | 15) vs_year=2017 ;; |
| 221 | + 16) vs_year=2019 ;; | |
| 221 | 222 | *) die Unrecognized Visual Studio Version in $opt ;; |
| 222 | 223 | esac |
| 223 | 224 | ;; |
| @@ -231,7 +232,7 @@ done · 7 unmodified lines | ||
| 231 | 232 | outfile=${outfile:-/dev/stdout} |
| 232 | 233 | mkoutfile=${mkoutfile:-/dev/stdout} |
| 233 | 234 | case "${vs_ver}" in |
| 234 | − 1[4-5]) | |
| 235 | + 1[4-6]) | |
| 235 | 236 | # VS has used Format Version 12.00 continuously since vs11. |
| 236 | 237 | sln_vers="12.00" |
| 237 | 238 | sln_vers_str="Visual Studio ${vs_year}" |
| @@ -34,7 +34,7 @@ Options: · 33 unmodified lines | ||
| 34 | 34 | --name=project_name Name of the project (required) |
| 35 | 35 | --proj-guid=GUID GUID to use for the project |
| 36 | 36 | --module-def=filename File containing export definitions (for DLLs) |
| 37 | − --ver=version Version (14,15) of visual studio to generate for | |
| 37 | + --ver=version Version (14-16) of visual studio to generate for | |
| 38 | 38 | --src-path-bare=dir Path to root of source tree |
| 39 | 39 | -Ipath/to/include Additional include directories |
| 40 | 40 | -DFLAG[=value] Preprocessor macros to define |
| @@ -168,7 +168,7 @@ for opt in "$@"; do · 127 unmodified lines | ||
| 168 | 168 | --ver=*) |
| 169 | 169 | vs_ver="$optval" |
| 170 | 170 | case "$optval" in |
| 171 | − 1[4-5]) | |
| 171 | + 1[4-6]) | |
| 172 | 172 | ;; |
| 173 | 173 | *) die Unrecognized Visual Studio Version in $opt |
| 174 | 174 | ;; |
| @@ -339,6 +339,9 @@ generate_vcxproj() { · 164 unmodified lines | ||
| 339 | 339 | if [ "$vs_ver" = "15" ]; then |
| 340 | 340 | tag_content PlatformToolset v141 |
| 341 | 341 | fi |
| 342 | + if [ "$vs_ver" = "16" ]; then | |
| 343 | + tag_content PlatformToolset v142 | |
| 344 | + fi | |
| 342 | 345 | tag_content CharacterSet Unicode |
| 343 | 346 | if [ "$config" = "Release" ]; then |
| 344 | 347 | tag_content WholeProgramOptimization true |
| @@ -137,6 +137,7 @@ all_platforms="${all_platforms} x86-solaris-gcc" · 136 unmodified lines | ||
| 137 | 137 | all_platforms="${all_platforms} x86-win32-gcc" |
| 138 | 138 | all_platforms="${all_platforms} x86-win32-vs14" |
| 139 | 139 | all_platforms="${all_platforms} x86-win32-vs15" |
| 140 | +all_platforms="${all_platforms} x86-win32-vs16" | |
| 140 | 141 | all_platforms="${all_platforms} x86_64-android-gcc" |
| 141 | 142 | all_platforms="${all_platforms} x86_64-darwin9-gcc" |
| 142 | 143 | all_platforms="${all_platforms} x86_64-darwin10-gcc" |
| @@ -155,6 +156,7 @@ all_platforms="${all_platforms} x86_64-solaris-gcc" · 12 unmodified lines | ||
| 155 | 156 | all_platforms="${all_platforms} x86_64-win64-gcc" |
| 156 | 157 | all_platforms="${all_platforms} x86_64-win64-vs14" |
| 157 | 158 | all_platforms="${all_platforms} x86_64-win64-vs15" |
| 159 | +all_platforms="${all_platforms} x86_64-win64-vs16" | |
| 158 | 160 | all_platforms="${all_platforms} generic-gnu" |
| 159 | 161 | |
| 160 | 162 | # all_targets is a list of all targets that can be configured |