solvespace/cython/platform/cygwinccompiler.diff

23 lines
915 B
Diff
Raw Normal View History

2019-05-28 12:00:15 +00:00
--- cygwinccompiler.py
+++ cygwinccompiler.py
2020-07-08 07:58:13 +00:00
@@ -84,7 +84,21 @@ def get_msvcr():
2019-05-28 12:00:15 +00:00
elif msc_ver == '1600':
# VS2010 / MSVC 10.0
return ['msvcr100']
+ elif msc_ver == '1700':
+ # Visual Studio 2012 / Visual C++ 11.0
+ return ['msvcr110']
+ elif msc_ver == '1800':
+ # Visual Studio 2013 / Visual C++ 12.0
+ return ['msvcr120']
+ elif msc_ver == '1900':
+ # Visual Studio 2015 / Visual C++ 14.0
+ # "msvcr140.dll no longer exists" http://blogs.msdn.com/b/vcblog/archive/2014/06/03/visual-studio-14-ctp.aspx
+ return ['vcruntime140']
2020-07-08 07:58:13 +00:00
+ elif 1910 <= int(msc_ver) <= 1916:
2019-05-28 12:00:15 +00:00
+ return ['vcruntime140']
2021-02-12 03:00:07 +00:00
+ elif 1920 <= int(msc_ver) <= 1928:
2019-05-28 12:00:15 +00:00
+ return ['vcruntime140']
else:
raise ValueError("Unknown MS Compiler version %s " % msc_ver)