File tree Expand file tree Collapse file tree 3 files changed +13
-2
lines changed Expand file tree Collapse file tree 3 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -97,10 +97,15 @@ FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
97
97
IF EXIST " %%i \VC\Auxiliary\Build\vcvars32.bat" (
98
98
CALL " %%i \VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV=" %PremakeVsVersion% " -f Bootstrap.mak windows
99
99
EXIT /B %ERRORLEVEL%
100
+ ) ELSE (
101
+ IF EXIST " %%i \VC\Auxiliary\Build\vcvars64.bat" (
102
+ CALL " %%i \VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV=" %PremakeVsVersion% " -f Bootstrap.mak windows
103
+ EXIT /B %ERRORLEVEL%
104
+ )
100
105
)
101
106
)
102
107
103
- ECHO Could not find vcvars32.bat to setup Visual Studio environment
108
+ ECHO Could not find vcvars32.bat or vcvars64.bat to setup Visual Studio environment
104
109
EXIT /B 2
105
110
106
111
REM :VsWhereVisualBootstrap
Original file line number Diff line number Diff line change 112
112
--
113
113
{ " Win32" , " Same as x86" },
114
114
{ " x64" , " Same as x86_64" },
115
+ --
116
+ { " default" , " Generates default platforms for targets, x86 and x86_64 projects for Windows." }
115
117
},
116
- default = " x86 " ,
118
+ default = " default " ,
117
119
}
118
120
119
121
--
166
168
filter { " system:windows" , " options:arch=x86_64 or arch=x64" }
167
169
platforms { " x64" }
168
170
171
+ filter { " system:windows" , " options:arch=default" }
172
+ platforms { " x86" , " x64" }
173
+
169
174
filter " configurations:Debug"
170
175
defines " _DEBUG"
171
176
flags { " Symbols" }
Original file line number Diff line number Diff line change 24
24
25
25
if os .ishost (" windows" ) then
26
26
allowedCompilers = {
27
+ " vs2022" ,
27
28
" vs2019" ,
28
29
" vs2017" ,
29
30
" vs2015" ,
You can’t perform that action at this time.
0 commit comments