File tree 3 files changed +20
-8
lines changed 3 files changed +20
-8
lines changed Original file line number Diff line number Diff line change @@ -8,12 +8,15 @@ echo [0] Clean
8
8
echo [1] Visual C++ 2012
9
9
echo [2] Visual C++ 2013
10
10
echo [3] Visual C++ 2015
11
- echo [4] GNU Make
11
+ echo [4] Visual C++ 2017
12
+ echo [5] GNU Make
13
+
12
14
echo .
13
15
14
16
:choice
15
17
set /P C = " Choice: "
16
- if " %C% " == " 4" goto gmake
18
+ if " %C% " == " 5" goto gmake
19
+ if " %C% " == " 4" goto vs2017
17
20
if " %C% " == " 3" goto vs2015
18
21
if " %C% " == " 2" goto vs2013
19
22
if " %C% " == " 1" goto vs2012
@@ -35,6 +38,10 @@ goto quit
35
38
" premake5" --file=premake5.lua vs2015
36
39
goto quit
37
40
41
+ :vs2017
42
+ " premake5" --file=premake5.lua vs2017
43
+ goto quit
44
+
38
45
:gmake
39
46
" premake5" --file=premake5.lua gmake
40
47
goto quit
Original file line number Diff line number Diff line change @@ -75,12 +75,17 @@ function SetupManagedProject()
75
75
configuration (c )
76
76
end
77
77
78
- if action == " vs2015 " then
78
+ if action == " vs2017 " then
79
79
80
- configuration " vs2015"
81
- framework " 4.6"
82
-
83
- end
80
+ configuration " vs2017"
81
+ framework " 4.6"
82
+
83
+ elseif action == " vs2015" then
84
+
85
+ configuration " vs2015"
86
+ framework " 4.6"
87
+
88
+ end
84
89
85
90
configuration " vs2013"
86
91
framework " 4.5"
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ function get_toolset_configuration_name()
62
62
63
63
if not string .starts (vsver , " vs" ) then
64
64
local out = outputof (" cl" )
65
- local ver , arch = string.match (out , ' (%d+).%d+.%d+.?%d*%s+%w*%s+(%w+) ' )
65
+ local ver , arch = string.match (out , ' (%d+).%d+.%d+.?%d*%s+' )
66
66
vsver = get_vs_version (ver )
67
67
end
68
68
You can’t perform that action at this time.
0 commit comments