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

WindowsPlatform: set up Visual Studio environment before running cl.exe for HashLink/C

Browse Source
This commit is contained in:
Josh Tynjala
2023-11-18 14:57:58 -08:00
parent 0a83f5c61f
commit 5ce9c5c218
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/platforms/WindowsPlatform.hx
View File

@@ -354,19 +354,31 @@ class WindowsPlatform extends PlatformTarget
} }
else else
{ {
command = ["cl.exe", "/Ox", "/Fe:" + executablePath, "-I", Path.combine(targetDirectory, "obj"), Path.combine(targetDirectory, "obj/ApplicationMain.c")]; // 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.VisualStudio.Component.VC.Tools.x86.x64", "-property", "installationPath"]);
var visualStudioPath = StringTools.trim(vswhereOutput);
var vcvarsallPath = visualStudioPath + "\\VC\\Auxiliary\\Build\\vcvarsall.bat";
// this command sets up the environment variables and things that visual studio requires
var vcvarsallCommand = [vcvarsallPath, "x64"].map(arg -> ~/([&|\(\)<>\^ ])/g.replace(arg, "^$1"));
// this command runs the cl.exe c compiler from visual studio
var clCommand = ["cl.exe", "/Ox", "/Fe:" + executablePath, "-I", Path.combine(targetDirectory, "obj"), Path.combine(targetDirectory, "obj/ApplicationMain.c")];
for (file in System.readDirectory(applicationDirectory)) for (file in System.readDirectory(applicationDirectory))
{ {
switch Path.extension(file) switch Path.extension(file)
{ {
case "lib": case "lib":
// ensure the executable knows about every library // ensure the executable knows about every library
command.push(file); clCommand.push(file);
default: default:
} }
} }
command.push("/link"); clCommand.push("/link");
command.push("/subsystem:windows"); clCommand.push("/subsystem:windows");
clCommand = clCommand.map(arg -> ~/([&|\(\)<>\^ ])/g.replace(arg, "^$1"));
// combine both commands into one
command = ["cmd.exe", "/s", "/c", vcvarsallCommand.join(" ") + " && " + clCommand.join(" ")];
} }
System.runCommand("", command.shift(), command); System.runCommand("", command.shift(), command);
} }