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

IDE: RunParameters: fix params for unassigned mode

Browse Source 
git-svn-id: trunk@56771 -
This commit is contained in:
ondrej 2017-12-17 19:11:42 +00:00
parent f552459574
commit 3af018e5b0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ide/buildmanager.pas
View File

@ -603,13 +603,13 @@ begin
Result := '';
if Project1=nil then exit;
AMode := Project1.RunParameterOptions.GetActiveMode;
if AMode=nil then exit;
if AMode.UseLaunchingApplication then
if (AMode<>nil) and AMode.UseLaunchingApplication then
Result := AMode.LaunchingApplicationPathPlusParams;
if Result='' then
begin
Result := AMode.CmdLineParams;
if (AMode<>nil) then
Result := AMode.CmdLineParams;
if GlobalMacroList.SubstituteStr(Result) then
begin
TargetFilename := GetTargetFilename;
@ -708,8 +708,8 @@ begin
Result:='';
if aProject=nil then exit;
AMode := aProject.RunParameterOptions.GetActiveMode;
if AMode=nil then exit;
Result:=AMode.HostApplicationFilename;
if AMode<>nil then
Result:=AMode.HostApplicationFilename;
GlobalMacroList.SubstituteStr(Result);
if (Result='') and (aProject.MainUnitID>=0) then begin
Result := aProject.CompilerOptions.CreateTargetFilename;
@ -2191,14 +2191,15 @@ end;
function TBuildManager.MacroFuncTargetCmdLine(const Param: string;
const Data: PtrInt; var Abort: boolean): string;
begin
if (Project1<>nil) and (Project1.RunParameterOptions.GetActiveMode<>nil) then begin
Result:=Project1.RunParameterOptions.GetActiveMode.CmdLineParams;
Result:='';
if (Project1<>nil) then begin
if (Project1.RunParameterOptions.GetActiveMode<>nil) then
Result:=Project1.RunParameterOptions.GetActiveMode.CmdLineParams;
if Result='' then
Result:=GetProjectTargetFilename(Project1)
else
Result:=GetProjectTargetFilename(Project1)+' '+Result;
end else
Result:='';
end;
end;
function TBuildManager.MacroFuncRunCmdLine(const Param: string;