Update premake to support vs2017.

2017-04-23 22:01:34 -05:00 · 2017-04-23 22:01:34 -05:00 · 8c16f91b7b
parent cecc66622f
commit 8c16f91b7b
3 changed files with 6 additions and 2 deletions
--- a/third_party/premake-core
+++ b/third_party/premake-core
@ -1 +1 @@
-Subproject commit 8f0683d823963d097cf4bc2958b5f50f35f6456a
+Subproject commit 5dfb0238bc309df04819dd430def621ce854678d
--- a/tools/build/bin/premake5.exe
+++ b/tools/build/bin/premake5.exe
--- a/6
+++ b/6
@ -356,7 +356,11 @@ def run_platform_premake():
  if sys.platform == 'darwin':
    return run_premake('macosx', 'xcode4')
  elif sys.platform == 'win32':
-    return run_premake('windows', 'vs2015')
+    vs_version = '2015'
+    if 'VSVERSION' in os.environ:
+      vs_version = os.environ['VSVERSION']
+
+    return run_premake('windows', 'vs' + vs_version)
  else:
    ret = run_premake('linux', 'gmake')
    ret = ret != 0 and run_premake('linux', 'codelite') or ret