kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 8.2.0-Dev

Browse Source
This commit is contained in:
Joseph Cloutier
2024-04-13 03:09:20 -04:00
parent fc90d2cd21 bb3b31b08d
commit 657ad24682
10 changed files with 320 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/platforms/WindowsPlatform.hx
View File

@@ -238,7 +238,23 @@ class WindowsPlatform extends PlatformTarget
{
System.runCommand("", "haxe", [hxml]);
var msBuildPath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\MSBuild.exe";
// start by finding visual studio
var programFilesX86 = Sys.getEnv("ProgramFiles(x86)");
var vswhereCommand = programFilesX86 + "\\Microsoft Visual Studio\\Installer\\vswhere.exe";
var vswhereOutput = System.runProcess("", vswhereCommand, ["-latest", "-products", "*", "-requires", "Microsoft.Component.MSBuild", "-property", "installationPath"]);
var visualStudioPath = StringTools.trim(vswhereOutput);
// then, find MSBuild inside visual studio
var msBuildPath = visualStudioPath + "\\MSBuild\\Current\\Bin\\MSBuild.exe";
if (!FileSystem.exists(msBuildPath))
{
// fallback for VS 2017, which didn't use Current
msBuildPath = visualStudioPath + "\\MSBuild\\15.0\\Bin\\MSBuild.exe";
if (!FileSystem.exists(msBuildPath))
{
Log.error("MSBuild not found");
return;
}
}
var args = [
Path.tryFullPath(targetDirectory + "/source/" + project.app.file + ".jsproj"),
"/p:Configuration=Release"