@@ -257,13 +257,6 @@ def vswhere(version):
257
257
program_files = os .environ ['ProgramFiles' ]
258
258
vswhere_path = os .path .join (program_files , 'Microsoft Visual Studio' , 'Installer' , 'vswhere.exe' )
259
259
output = json .loads (subprocess .check_output ([vswhere_path , '-latest' , '-version' , '[%s.0,%s.0)' % (version , version + 1 ), '-requires' , 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64' , '-property' , 'installationPath' , '-format' , 'json' ]))
260
- # Visual Studio 2017 Express is not included in the above search, and it
261
- # does not have the VC.Tools.x86.x64 tool, so do a catch-all attempt as a
262
- # fallback, to detect Express version.
263
- if not output :
264
- output = json .loads (subprocess .check_output ([vswhere_path , '-latest' , '-version' , '[%s.0,%s.0)' % (version , version + 1 ), '-products' , '*' , '-property' , 'installationPath' , '-format' , 'json' ]))
265
- if not output :
266
- return ''
267
260
return str (output [0 ]['installationPath' ])
268
261
except Exception :
269
262
return ''
@@ -288,24 +281,18 @@ def vs_filewhere(installation_path, platform, file):
288
281
CMAKE_GENERATOR = 'Visual Studio 17'
289
282
elif '--vs2019' in sys .argv :
290
283
CMAKE_GENERATOR = 'Visual Studio 16'
291
- elif '--vs2017' in sys .argv :
292
- CMAKE_GENERATOR = 'Visual Studio 15'
293
284
elif len (vswhere (17 )) > 0 :
294
285
CMAKE_GENERATOR = 'Visual Studio 17'
295
286
elif len (vswhere (16 )) > 0 :
296
287
CMAKE_GENERATOR = 'Visual Studio 16'
297
- elif len (vswhere (15 )) > 0 :
298
- # VS2017 has an LLVM build issue, see
299
- # https://github.com/kripken/emscripten-fastcomp/issues/185
300
- CMAKE_GENERATOR = 'Visual Studio 15'
301
288
elif which ('mingw32-make' ) is not None and which ('g++' ) is not None :
302
289
CMAKE_GENERATOR = 'MinGW Makefiles'
303
290
else :
304
291
# No detected generator
305
292
CMAKE_GENERATOR = ''
306
293
307
294
308
- sys .argv = [a for a in sys .argv if a not in ('--mingw' , '--vs2017' , '-- vs2019' , '--vs2022' )]
295
+ sys .argv = [a for a in sys .argv if a not in ('--mingw' , '--vs2019' , '--vs2022' )]
309
296
310
297
311
298
# Computes a suitable path prefix to use when building with a given generator.
@@ -314,8 +301,6 @@ def cmake_generator_prefix():
314
301
return '_vs2022'
315
302
if CMAKE_GENERATOR == 'Visual Studio 16' :
316
303
return '_vs2019'
317
- if CMAKE_GENERATOR == 'Visual Studio 15' :
318
- return '_vs2017'
319
304
elif CMAKE_GENERATOR == 'MinGW Makefiles' :
320
305
return '_mingw'
321
306
# Unix Makefiles do not specify a path prefix for backwards path compatibility
@@ -2685,7 +2670,7 @@ def main(args):
2685
2670
purposes. Default: Enabled
2686
2671
--disable-assertions: Forces assertions off during the build.
2687
2672
2688
- --vs2017/ --vs2019/--vs2022: If building from source, overrides to build
2673
+ --vs2019/--vs2022: If building from source, overrides to build
2689
2674
using the specified compiler. When installing
2690
2675
precompiled packages, this has no effect.
2691
2676
Note: The same compiler specifier must be
@@ -2708,7 +2693,7 @@ def main(args):
2708
2693
2709
2694
if WINDOWS :
2710
2695
print ('''
2711
- emsdk activate [--permanent] [--system] [--build=type] [--vs2017/-- vs2019/--vs2022] <tool/sdk>
2696
+ emsdk activate [--permanent] [--system] [--build=type] [--vs2019/--vs2022] <tool/sdk>
2712
2697
2713
2698
- Activates the given tool or SDK in the
2714
2699
environment of the current shell.
@@ -2722,7 +2707,7 @@ def main(args):
2722
2707
(uses Machine environment variables).
2723
2708
2724
2709
- If a custom compiler version was used to override
2725
- the compiler to use, pass the same --vs2017/-- vs2019/--vs2022
2710
+ the compiler to use, pass the same --vs2019/--vs2022
2726
2711
parameter here to choose which version to activate.
2727
2712
2728
2713
emcmdprompt.bat - Spawns a new command prompt window with the
0 commit comments