Merge branch 'master' of http://git.ius.plus/jimmy.jiang/LabwinSetup

# Conflicts:
#	flyinsono_Lab_All.iss

flyinsono_Lab_All.iss

@@ -61,9 +61,10 @@ chinese.SetupWindowTitle=杏聆荟科研版安装向导
 
 [Files]
 //onlyifdoesntexist 仅在文件不存在的时候 安装
-//Source: extra\FlyinsonoLabServer\*; DestDir: "C:\FlyinsonoLabServer"; Flags: ignoreversion recursesubdirs createallsubdirs;
-//Source: extra\VinnoApp\*; DestDir: "C:\VinnoApp"; Flags: recursesubdirs createallsubdirs ignoreversion onlyifdoesntexist;
-//Source: extra\MATLAB_Runtime_R2020b_Update_8_win64\*; DestDir: "{app}\MATLAB_Runtime_R2020b_Update_8_win64"; Flags: recursesubdirs createallsubdirs ignoreversion onlyifdoesntexist;
+Source: extra\FlyinsonoLabServer\*; DestDir: "C:\FlyinsonoLabServer"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: extra\vcruntime140_1.dll; DestDir: "{app}"; Flags: ignoreversion;
+Source: extra\VinnoApp\*; DestDir: "C:\VinnoApp"; Flags: recursesubdirs createallsubdirs ignoreversion onlyifdoesntexist;
+Source: extra\MATLAB_Runtime_R2020b_Update_8_win64\*; DestDir: "{app}\MATLAB_Runtime_R2020b_Update_8_win64"; Flags: recursesubdirs createallsubdirs ignoreversion onlyifdoesntexist;
 Source: resource\*; DestDir: {tmp}; Flags: dontcopy solidbreak ; Attribs: hidden system
 Source: {#ProjectFolder}\App\*; DestDir: "{app}\App"; Flags: ignoreversion recursesubdirs createallsubdirs; BeforeInstall: BeforeInstallFis
 Source: {#ProjectFolder}\CefGlueBrowserProcess\*; DestDir: "{app}\CefGlueBrowserProcess"; Flags: ignoreversion recursesubdirs createallsubdirs;