paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-10 21:42:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: macro TargetOS(IDE) return os of IDE executable, analog macro TargetCPU, macro SrcOS(os)

Browse Source 
git-svn-id: trunk@36031 -
This commit is contained in:
mattias 2012-03-15 13:23:00 +00:00
parent 8c82016111
commit badac6ae4a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/buildmanager.pas
View File

@ -1471,6 +1471,8 @@ function TBuildManager.MacroFuncTargetCPU(const Param: string;
begin begin
if Data=CompilerOptionMacroPlatformIndependent then if Data=CompilerOptionMacroPlatformIndependent then
Result:='%(CPU_TARGET)' Result:='%(CPU_TARGET)'
else if SysUtils.CompareText(Param,'IDE')=0 then
Result:=GetCompiledTargetCPU
else else
Result:=GetTargetCPU; Result:=GetTargetCPU;
end; end;
@ -1480,6 +1482,8 @@ function TBuildManager.MacroFuncTargetOS(const Param: string;
begin begin
if Data=CompilerOptionMacroPlatformIndependent then if Data=CompilerOptionMacroPlatformIndependent then
Result:='%(OS_TARGET)' Result:='%(OS_TARGET)'
else if SysUtils.CompareText(Param,'IDE')=0 then
Result:=GetCompiledTargetOS
else else
Result:=GetTargetOS; Result:=GetTargetOS;
end; end;
@ -1520,6 +1524,8 @@ function TBuildManager.MacroFuncSrcOS(const Param: string; const Data: PtrInt;
begin begin
if Data=CompilerOptionMacroPlatformIndependent then if Data=CompilerOptionMacroPlatformIndependent then
Result:='%(OS_TARGET)' Result:='%(OS_TARGET)'
else if Param<>'' then
Result:=GetDefaultSrcOSForTargetOS(Param)
else else
Result:=GetDefaultSrcOSForTargetOS(GetTargetOS); Result:=GetDefaultSrcOSForTargetOS(GetTargetOS);
end; end;

6
ide/initialsetupdlgs.pas
View File

@ -846,11 +846,11 @@ begin
s:=LazarusDir s:=LazarusDir
else else
s:='<LazarusDirNotSet>'; s:='<LazarusDirNotSet>';
end else if CompareText(MacroName,'TargetOS')=0 then end else if (CompareText(MacroName,'TargetOS')=0) then
s:=GetCompiledTargetOS s:=GetCompiledTargetOS
else if CompareText(MacroName,'TargetCPU')=0 then else if (CompareText(MacroName,'TargetCPU')=0) then
s:=GetCompiledTargetCPU s:=GetCompiledTargetCPU
else if CompareText(MacroName,'SrcOS')=0 then else if (CompareText(MacroName,'SrcOS')=0) then
s:=GetDefaultSrcOSForTargetOS(GetCompiledTargetOS) s:=GetDefaultSrcOSForTargetOS(GetCompiledTargetOS)
else else
Handled:=false; Handled:=false;