History

support visual studio 2019 (vs16)

Johann committed 7 years ago

Commit daefbf21 parent 154da5b4 files · +12 −4Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t