paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 12:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: added macro SrcOS

Browse Source 
git-svn-id: trunk@16466 -
This commit is contained in:
mattias 2008-09-07 12:04:28 +00:00
parent 9d5002e39f
commit 094be7aab5
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ide/buildmanager.pas
View File

@ -67,6 +67,8 @@ type
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncTargetOS(const Param: string; const Data: PtrInt; function MacroFuncTargetOS(const Param: string; const Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncSrcOS(const Param: string; const Data: PtrInt;
var Abort: boolean): string;
function MacroFuncFPCVer(const Param: string; const Data: PtrInt; function MacroFuncFPCVer(const Param: string; const Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncParams(const Param: string; const Data: PtrInt; function MacroFuncParams(const Param: string; const Data: PtrInt;
@ -231,6 +233,8 @@ begin
lisTargetCPU,@MacroFuncTargetCPU,[])); lisTargetCPU,@MacroFuncTargetCPU,[]));
GlobalMacroList.Add(TTransferMacro.Create('TargetOS','', GlobalMacroList.Add(TTransferMacro.Create('TargetOS','',
lisTargetOS,@MacroFuncTargetOS,[])); lisTargetOS,@MacroFuncTargetOS,[]));
GlobalMacroList.Add(TTransferMacro.Create('SrcOS','',
lisSrcOS,@MacroFuncSrcOS,[]));
GlobalMacroList.Add(TTransferMacro.Create('FPCVer','', GlobalMacroList.Add(TTransferMacro.Create('FPCVer','',
lisFPCVersionEG222, @MacroFuncFPCVer, [])); lisFPCVersionEG222, @MacroFuncFPCVer, []));
GlobalMacroList.Add(TTransferMacro.Create('Params','', GlobalMacroList.Add(TTransferMacro.Create('Params','',
@ -1089,6 +1093,15 @@ begin
Result:=GetTargetOS(true); Result:=GetTargetOS(true);
end; end;
function TBuildManager.MacroFuncSrcOS(const Param: string; const Data: PtrInt;
var Abort: boolean): string;
begin
if Data=CompilerOptionMacroPlatformIndependent then
Result:='%(OS_TARGET)'
else
Result:=GetDefaultSrcOSForTargetOS(GetTargetOS(true));
end;
function TBuildManager.MacroFuncFPCVer(const Param: string; const Data: PtrInt; function TBuildManager.MacroFuncFPCVer(const Param: string; const Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
var var

1
ide/lazarusidestrconsts.pas
View File

@ -101,6 +101,7 @@ resourcestring
lisCOVarious = '%s (various)'; lisCOVarious = '%s (various)';
lisTargetCPU = 'Target CPU'; lisTargetCPU = 'Target CPU';
lisTargetOS = 'Target OS'; lisTargetOS = 'Target OS';
lisSrcOS = 'Src OS';
lisCommandLineParamsOfProgram = 'Command line parameters of program'; lisCommandLineParamsOfProgram = 'Command line parameters of program';
lisPromptForValue = 'Prompt for value'; lisPromptForValue = 'Prompt for value';
lisProjectFilename = 'Project filename'; lisProjectFilename = 'Project filename';

2
ide/startlazarus.lpi
View File

@ -53,7 +53,7 @@
<Filename Value="../startlazarus$(ExeExt)"/> <Filename Value="../startlazarus$(ExeExt)"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="include/$(TargetOS)/;include/$(SrcOS)/"/> <IncludeFiles Value="include/;include/$(TargetOS)/;include/$(SrcOS)/"/>
<OtherUnitFiles Value="../designer/;../packager/;../components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> <OtherUnitFiles Value="../designer/;../packager/;../components/codetools/units/$(TargetCPU)-$(TargetOS)/"/>
<UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>