paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-17 04:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed make output recognition for win32

Browse Source 
git-svn-id: trunk@5741 -
This commit is contained in:
mattias 2004-08-04 17:38:08 +00:00
parent 79f1d1940b
commit 6e92b90671
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/buildlazdialog.pas
View File

@ -348,7 +348,7 @@ begin
Tool.Title:=CurItem.Description;
if (CurItem=Options.ItemIDE) and (blfWithoutLinkingIDE in Flags) then
Tool.Title:=lisCompileIDEWithoutLinking;
Tool.WorkingDirectory:='$(LazarusDir)/'+CurItem.Directory;
Tool.WorkingDirectory:='$(LazarusDir)'+PathDelim+CurItem.Directory;
Tool.CmdLineParams:=CurItem.Commands[CurMakeMode];
// append extra options
ExtraOptions:='';

8
ide/outputfilter.pas
View File

@ -30,7 +30,7 @@ interface
uses
Classes, SysUtils, Forms, Controls, CompilerOptions, Project, Process,
IDEProcs, FileCtrl;
IDEProcs, FileCtrl, LazConf;
type
TOnOutputString = procedure(const Msg, Directory: String) of Object;
@ -743,14 +743,16 @@ const
LeavingDirPattern = ']: Leaving directory `';
MakeMsgPattern = ']: *** [';
var
MakeBeginPattern: string;
i: integer;
BracketEnd: Integer;
MsgStartPos: Integer;
MakeMsg: String;
begin
Result:=false;
i:=length('make[');
if copy(s,1,i)<>'make[' then exit;
MakeBeginPattern:= 'make' + GetDefaultExecutableExt + '[';
i:=length(MakeBeginPattern);
if copy(s,1,i)<>MakeBeginPattern then exit;
Result:=true;
inc(i);