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

IDE: added default build macros SrcOS and SrcOS2

Browse Source 
git-svn-id: trunk@27499 -
This commit is contained in:
mattias 2010-09-28 10:51:36 +00:00
parent 6ebaacbba1
commit 97709d81c5
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/buildmanager.pas
View File

@ -1648,12 +1648,21 @@ begin
end;
// add the defaults
// Note: see also ide/frames/compiler_buildmacro_options.pas procedure TCompOptBuildMacrosFrame.BuildMacrosTreeViewEdited
if not Result.IsDefined('TargetOS') then begin
s:=Project1.CompilerOptions.TargetOS;
if s='' then
s:=GetDefaultTargetOS;
Result.Values['TargetOS']:=s;
end;
if not Result.IsDefined('SrcOS') then begin
s:=GetDefaultSrcOSForTargetOS(Result.Values['TargetOS']);
Result.Values['SrcOS']:=s;
end;
if not Result.IsDefined('SrcOS2') then begin
s:=GetDefaultSrcOS2ForTargetOS(Result.Values['TargetOS']);
Result.Values['SrcOS2']:=s;
end;
if not Result.IsDefined('TargetCPU') then begin
s:=Project1.CompilerOptions.TargetCPU;
if s='' then

2
ide/frames/compiler_buildmacro_options.pas
View File

@ -223,6 +223,8 @@ begin
ConflictBuildProperty:=BuildMacros.VarWithIdentifier(S);
if ((ConflictBuildProperty<>nil) and (ConflictBuildProperty<>BuildMacro))
or (SysUtils.CompareText('TargetOS',S)=0)
or (SysUtils.CompareText('SrcOS',S)=0)
or (SysUtils.CompareText('SrcOS2',S)=0)
or (SysUtils.CompareText('TargetCPU',S)=0)
or (SysUtils.CompareText('LCLWidgetType',S)=0)
then begin