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

IDE: fixed adding base directory to search paths

Browse Source 
git-svn-id: trunk@10253 -
This commit is contained in:
mattias 2006-11-28 18:51:19 +00:00
parent 1506d45d5e
commit cc16db91ec
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ide/compileroptions.pp
View File

@ -331,21 +331,21 @@ type
function NeedsLinkerOpts: boolean; function NeedsLinkerOpts: boolean;
function GetUnitPath(RelativeToBaseDir: boolean; function GetUnitPath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed; Parsed: TCompilerOptionsParseType = coptParsed;
WithProjDir: boolean = false): string; WithProjDir: boolean = true): string;
function GetIncludePath(RelativeToBaseDir: boolean; function GetIncludePath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed; Parsed: TCompilerOptionsParseType = coptParsed;
WithProjDir: boolean = false): string; WithProjDir: boolean = true): string;
function GetSrcPath(RelativeToBaseDir: boolean; function GetSrcPath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed; Parsed: TCompilerOptionsParseType = coptParsed;
WithProjDir: boolean = false): string; WithProjDir: boolean = true): string;
function GetLibraryPath(RelativeToBaseDir: boolean; function GetLibraryPath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed; Parsed: TCompilerOptionsParseType = coptParsed;
WithProjDir: boolean = false): string; WithProjDir: boolean = true): string;
function GetUnitOutPath(RelativeToBaseDir: boolean; function GetUnitOutPath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed): string; Parsed: TCompilerOptionsParseType = coptParsed): string;
function GetObjectPath(RelativeToBaseDir: boolean; function GetObjectPath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed; Parsed: TCompilerOptionsParseType = coptParsed;
WithProjDir: boolean = false): string; WithProjDir: boolean = true): string;
function GetPath(Option: TParsedCompilerOptString; function GetPath(Option: TParsedCompilerOptString;
InheritedOption: TInheritedCompilerOption; InheritedOption: TInheritedCompilerOption;
RelativeToBaseDir: boolean; RelativeToBaseDir: boolean;
@ -2143,19 +2143,22 @@ Processor specific options:
{ ------------- Search Paths ---------------- } { ------------- Search Paths ---------------- }
// include path // include path
CurIncludePath:=GetIncludePath(not (cclAbsolutePaths in Flags)); CurIncludePath:=GetIncludePath(not (cclAbsolutePaths in Flags),
coptParsed,false);
if (CurIncludePath <> '') then if (CurIncludePath <> '') then
switches := switches + ' ' + ConvertSearchPathToCmdLine('-Fi', CurIncludePath); switches := switches + ' ' + ConvertSearchPathToCmdLine('-Fi', CurIncludePath);
// library path // library path
if (not (ccloNoLinkerOpts in Flags)) then begin if (not (ccloNoLinkerOpts in Flags)) then begin
CurLibraryPath:=GetLibraryPath(not (cclAbsolutePaths in Flags)); CurLibraryPath:=GetLibraryPath(not (cclAbsolutePaths in Flags),
coptParsed,false);
if (CurLibraryPath <> '') then if (CurLibraryPath <> '') then
switches := switches + ' ' + ConvertSearchPathToCmdLine('-Fl', CurLibraryPath); switches := switches + ' ' + ConvertSearchPathToCmdLine('-Fl', CurLibraryPath);
end; end;
// object path // object path
CurObjectPath:=GetObjectPath(not (cclAbsolutePaths in Flags)); CurObjectPath:=GetObjectPath(not (cclAbsolutePaths in Flags),
coptParsed,false);
if (CurObjectPath <> '') then if (CurObjectPath <> '') then
switches := switches + ' ' + ConvertSearchPathToCmdLine('-Fo', CurObjectPath); switches := switches + ' ' + ConvertSearchPathToCmdLine('-Fo', CurObjectPath);