Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-06 00:05:59 +02:00
Code Activity

Merge remote-tracking branch 'upstream/master' into Yuvan/CustomBuildProperties

Browse source
This commit is contained in:
LAPTOP-NV8MPI8C\Yuvan Wickramasinghe 2025-03-28 14:48:45 -07:00
commit 4b879670ca
No known key found for this signature in database
294 changed files with 15180 additions and 4106 deletions
Download patch file Download diff file Expand all files Collapse all files

26
IDE/src/BuildContext.bf
View file

@ -695,23 +695,32 @@ namespace IDE
return false;
}
String compilerExePath = scope String();
// Set for auto-install without prompting
gApp.mSettings.mEmscriptenPendingInstall = false;
String wasmPath = Path.GetAbsolutePath("../wasm", gApp.mInstallDir, .. scope .());
if (!Directory.Exists(wasmPath))
Path.GetAbsolutePath("../../wasm", gApp.mInstallDir, wasmPath..Clear());
IDEUtils.FixFilePath(wasmPath);
if (gApp.mSettings.mEmscriptenPath.IsEmpty)
{
// Set for auto-install without prompting
gApp.mSettings.mEmscriptenPendingInstall = true;
}
else if (!File.Exists(scope $"{wasmPath}/EmsdkDep1_Done.txt"))
{
gApp.mSettings.mEmscriptenPendingInstall = true;
}
String compilerExePath = scope String();
if (gApp.mSettings.mEmscriptenPendingInstall)
{
#if CLI
gApp.Fail("Emscripten path not configured. Check Wasm configuration in File\\Preferences\\Settings.");
return false;
#else
if (gApp.mSettings.mEmscriptenPendingInstall)
{
String wasmPath = Path.GetAbsolutePath("../wasm", gApp.mInstallDir, .. scope .());
if (!Directory.Exists(wasmPath))
Path.GetAbsolutePath("../../wasm", gApp.mInstallDir, wasmPath..Clear());
IDEUtils.FixFilePath(wasmPath);
var runCmd = gApp.QueueRun(scope $"{wasmPath}/fetch_wasm.bat", "", wasmPath, .UTF8);
runCmd.mOnlyIfNotFailed = true;
@ -849,8 +858,7 @@ namespace IDE
if ((workspaceOptions.mEnableObjectDebugFlags)
|| (workspaceOptions.mAllocType == .Debug)
|| (workspaceOptions.mAllocType == .Stomp)
|| (workspaceOptions.mAllocStackTraceDepth > 0))
|| (workspaceOptions.mAllocType == .Stomp))
{
outDbg.Append("Beef", IDEApp.sRTVersionStr, "Dbg");
outDbg.Append((Workspace.PlatformType.GetPtrSizeByName(gApp.mPlatformName) == 4) ? "32" : "64");