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

Fixes from macOS, first working build

Browse source
This commit is contained in:
Brian Fiete 2019-10-15 17:27:09 -07:00
parent 2e84b4229c
commit 67ee302451
19 changed files with 237 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDE/src/BuildContext.bf
View file

@ -171,9 +171,15 @@ namespace IDE
//String error = scope String();
bool isExe = project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib;
TestManager.ProjectInfo testProjectInfo = null;
if (gApp.mTestManager != null)
testProjectInfo = gApp.mTestManager.GetProjectInfo(project);
bool isExe = (project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) || (testProjectInfo != null);
if (isExe)
{
CopyLibFiles(targetPath, workspaceOptions, options);
String linkLine = scope String(isDebug ? "-g " : "-g -O2 "); //-O2 -Rpass=inline
//(doClangCPP ? "-lc++abi " : "") +
@ -459,9 +465,9 @@ namespace IDE
String toPath = scope String();
Path.GetDirectoryPath(targetPath, toPath);
toPath.Append("/", dllName);
if (File.CopyIfNewer(fromPath, toPath) case .Err)
if (File.CopyIfNewer(fromPath, toPath) case .Err(let err))
{
gApp.OutputLine("Failed to copy lib file {0}", fromPath);
gApp.OutputLine("Failed to copy lib file '{0}' to '{1}'", fromPath, toPath);
return false;
}
return true;
@ -1048,8 +1054,6 @@ namespace IDE
return true;
}
CopyLibFiles(targetPath, workspaceOptions, options);
String objectsArg = scope String();
var argBuilder = scope IDEApp.ArgBuilder(objectsArg, workspaceOptions.mToolsetType != .GNU);
for (var bfFileName in bfFileNames)