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

Merge branch 'FPC-39988' into 'main'

Browse Source 
Issue #39988: Changed order of folders where to search for included files.

See merge request freepascal.org/lazarus/lazarus!155
This commit is contained in:
Maxim Ganetsky 2023-05-11 15:55:47 +00:00
commit 1ddbcea70c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/gir2pascal/gir2pascal.lpr
View File

@ -258,6 +258,12 @@ begin
Halt; Halt;
end; end;
FFileToConvert:=FCmdOptions.OptionValue('input');
AddPaths(ExtractFilePath(FFileToConvert));
if FCmdOptions.HasOption('paths') then
AddPaths(FCmdOptions.OptionValue('paths'));
if not FCmdOptions.HasOption('no-default') then if not FCmdOptions.HasOption('no-default') then
AddDefaultPaths; AddDefaultPaths;
@ -266,15 +272,9 @@ begin
else else
FOutPutDirectory:=IncludeTrailingPathDelimiter(GetCurrentDir); FOutPutDirectory:=IncludeTrailingPathDelimiter(GetCurrentDir);
FFileToConvert:=FCmdOptions.OptionValue('input');
AddPaths(ExtractFilePath(FFileToConvert));
if FCmdOptions.HasOption('unit-prefix') then if FCmdOptions.HasOption('unit-prefix') then
FUnitPrefix := FCmdOptions.OptionValue('unit-prefix'); FUnitPrefix := FCmdOptions.OptionValue('unit-prefix');
if FCmdOptions.HasOption('paths') then
AddPaths(FCmdOptions.OptionValue('paths'));
if FCmdOptions.HasOption('overwrite-files') then if FCmdOptions.HasOption('overwrite-files') then
FOverWriteFiles:=True; FOverWriteFiles:=True;