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

Fixed build paths, added comparison warnings, other misc fixes

Browse source
This commit is contained in:
Brian Fiete 2019-10-05 10:26:26 -07:00
parent dae5c6cee4
commit f4c252048e
19 changed files with 231 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

18
IDE/src/BuildContext.bf
View file

@ -831,19 +831,23 @@ namespace IDE
return true;
Workspace.Options workspaceOptions = gApp.GetCurWorkspaceOptions();
BfCompiler bfCompiler = gApp.mBfBuildCompiler;
BfCompiler bfCompiler = gApp.mBfBuildCompiler;
var bfProject = gApp.mBfBuildSystem.mProjectMap[project];
bool bfHadOutputChanges;
bool bfHadOutputChanges = false;
List<String> bfFileNames = scope List<String>();
bfCompiler.GetOutputFileNames(bfProject, true, out bfHadOutputChanges, bfFileNames);
defer ClearAndDeleteItems(bfFileNames);//DeleteAndClearItems!(bfFileNames);
if (project.mCurBfOutputFileNames == null)
{
project.mCurBfOutputFileNames = new .();
bfCompiler.GetOutputFileNames(bfProject, true, out bfHadOutputChanges, project.mCurBfOutputFileNames);
}
for (var fileName in project.mCurBfOutputFileNames)
bfFileNames.Add(fileName);
if (bfHadOutputChanges)
project.mNeedsTargetRebuild = true;
List<ProjectSource> allFileNames = scope List<ProjectSource>();
List<String> clangAllObjNames = scope List<String>();
//List<String> clangObjNames = scope List<String>();
gApp.GetClangFiles(project.mRootFolder, allFileNames);
String workspaceBuildDir = scope String();
@ -853,8 +857,6 @@ namespace IDE
if (!projectBuildDir.IsEmpty)
Directory.CreateDirectory(projectBuildDir).IgnoreError();
//List<String> buildFileNames = new List<String>();
String targetPath = scope String();
String outputDir = scope String();

2
IDE/src/Project.bf
View file

@ -1188,6 +1188,8 @@ namespace IDE
public bool mFailed;
public bool mNeedsCreate;
public List<String> mCurBfOutputFileNames ~ DeleteContainerAndItems!(_);
public String ProjectFileName
{
get

2
IDE/src/ui/WelcomePanel.bf
View file

@ -111,7 +111,7 @@ namespace IDE.ui
public override void Draw(Graphics g)
{
using (g.PushColor(0x40000000))
g.FillRect(mWidth/2 - GS!(500), YOfs - GS!(24), GS!(500)*2, 570);
g.FillRect(mWidth/2 - GS!(500), YOfs - GS!(24), GS!(500)*2, GS!(570));
g.SetFont(mLargeFont);
using (g.PushColor(0xFFE0E0FF))