From: Antoine ELIAS <antoine.elias@scilab-enterprises.com>
Date: Fri, 25 Nov 2016 10:17:06 +0000 (+0100)
Subject: findmsvccompiler: look for same VS version that scilab instead of newer version
X-Git-Tag: 6.0.0~349
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=75f6d28fc0bc5b0560b073b2d3534569b9461c1d

findmsvccompiler: look for same VS version that scilab instead of newer version

Change-Id: I833c78fd26d6b1f67be884c23f23200f3f16d1f3
---

diff --git a/scilab/modules/dynamic_link/macros/windows/dlwFindMsVcCompiler.sci b/scilab/modules/dynamic_link/macros/windows/dlwFindMsVcCompiler.sci
index c74ebcf..b10269f 100644
--- a/scilab/modules/dynamic_link/macros/windows/dlwFindMsVcCompiler.sci
+++ b/scilab/modules/dynamic_link/macros/windows/dlwFindMsVcCompiler.sci
@@ -39,23 +39,23 @@ function MSCompiler = dlwFindMsVcCompiler()
         end
     end
 
-    if dlwIsVc14Express() then
-        MSCompiler = "msvc140express";     // Microsoft Visual 2015 Express
+    if dlwIsVc12Express() then
+        MSCompiler = "msvc120express";     // Microsoft Visual 2013 Express
         return;
     end
 
-    if dlwIsVc14Pro() then
-        MSCompiler = "msvc140pro";       // Microsoft Visual 2015 Professional / Community (or more)
+    if dlwIsVc12Pro() then
+        MSCompiler = "msvc120pro";       // Microsoft Visual 2013 Professional (or more)
         return;
     end
 
-    if dlwIsVc12Express() then
-        MSCompiler = "msvc120express";     // Microsoft Visual 2013 Express
+    if dlwIsVc14Express() then
+        MSCompiler = "msvc140express";     // Microsoft Visual 2015 Express
         return;
     end
 
-    if dlwIsVc12Pro() then
-        MSCompiler = "msvc120pro";       // Microsoft Visual 2013 Professional (or more)
+    if dlwIsVc14Pro() then
+        MSCompiler = "msvc140pro";       // Microsoft Visual 2015 Professional / Community (or more)
         return;
     end