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

updates defines for fpc 1.9.2

Browse Source 
git-svn-id: trunk@5046 -
This commit is contained in:
mattias 2004-01-11 11:32:46 +00:00
parent 1766d6ed74
commit e365060c18
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/codetools/definetemplates.pas
View File

@ -3201,6 +3201,7 @@ begin
// rtl // rtl
RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory); RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory);
MainDir.AddChild(RTLDir); MainDir.AddChild(RTLDir);
// rtl include paths
s:=IncPathMacro s:=IncPathMacro
+';'+Dir+'rtl'+DS+'objpas'+DS +';'+Dir+'rtl'+DS+'objpas'+DS
+';'+Dir+'rtl'+DS+'objpas'+DS+'sysutils' +';'+Dir+'rtl'+DS+'objpas'+DS+'sysutils'
@ -3216,6 +3217,7 @@ begin
Format(ctsIncludeDirectoriesPlusDirs, Format(ctsIncludeDirectoriesPlusDirs,
['objpas, inc,'+TargetProcessor+','+SrcOS]), ['objpas, inc,'+TargetProcessor+','+SrcOS]),
ExternalMacroStart+'IncPath',s,da_DefineRecurse)); ExternalMacroStart+'IncPath',s,da_DefineRecurse));
// rtl/$(TargetOS)
if TargetOS<>'' then begin if TargetOS<>'' then begin
RTLOSDir:=TDefineTemplate.Create('TargetOS','Target OS','', RTLOSDir:=TDefineTemplate.Create('TargetOS','Target OS','',
TargetOS,da_Directory); TargetOS,da_Directory);
@ -3224,8 +3226,14 @@ begin
RTLOSDir.AddChild(TDefineTemplate.Create('Include Path', RTLOSDir.AddChild(TDefineTemplate.Create('Include Path',
Format(ctsIncludeDirectoriesPlusDirs,[TargetProcessor]), Format(ctsIncludeDirectoriesPlusDirs,[TargetProcessor]),
ExternalMacroStart+'IncPath',s,da_DefineRecurse)); ExternalMacroStart+'IncPath',s,da_DefineRecurse));
s:=SrcPathMacro
+';'+Dir+'rtl'+DS+'objpas'+DS;
RTLOSDir.AddChild(TDefineTemplate.Create('Src Path',
Format(ctsAddsDirToSourcePath,[TargetProcessor]),
ExternalMacroStart+'SrcPath',s,da_DefineRecurse));
RTLDir.AddChild(RTLOSDir); RTLDir.AddChild(RTLOSDir);
end; end;
// rtl/win32
RTLWin32Dir:=TDefineTemplate.Create('Win32','Win32','','win32',da_Directory); RTLWin32Dir:=TDefineTemplate.Create('Win32','Win32','','win32',da_Directory);
RTLDir.AddChild(RTLWin32Dir); RTLDir.AddChild(RTLWin32Dir);
RTLWin32Dir.AddChild(TDefineTemplate.Create('Include Path', RTLWin32Dir.AddChild(TDefineTemplate.Create('Include Path',
@ -3251,6 +3259,7 @@ begin
+';'+Dir+'fcl'+DS+'classes'+DS +';'+Dir+'fcl'+DS+'classes'+DS
+';'+Dir+'rtl'+DS+TargetOS+DS +';'+Dir+'rtl'+DS+TargetOS+DS
,da_DefineRecurse)); ,da_DefineRecurse));
// fcl/db
FCLDBDir:=TDefineTemplate.Create('DB','DB','','db',da_Directory); FCLDBDir:=TDefineTemplate.Create('DB','DB','','db',da_Directory);
FCLDir.AddChild(FCLDBDir); FCLDir.AddChild(FCLDBDir);
FCLDBInterbaseDir:=TDefineTemplate.Create('interbase','interbase','', FCLDBInterbaseDir:=TDefineTemplate.Create('interbase','interbase','',

17
ide/main.pp
View File

@ -8756,6 +8756,8 @@ var
ActiveSrcEdit:TSourceEditor; ActiveSrcEdit:TSourceEditor;
ErrorCaret: TPoint; ErrorCaret: TPoint;
OpenFlags: TOpenFlags; OpenFlags: TOpenFlags;
ErrorFilename: string;
ErrorTopLine: integer;
begin begin
if CodeToolBoss.ErrorMessage='' then begin if CodeToolBoss.ErrorMessage='' then begin
UpdateSourceNames; UpdateSourceNames;
@ -8782,13 +8784,15 @@ writeln('TMainIDE.DoJumpToCodeToolBossError A ',CodeToolBoss.ErrorCode<>nil);
if CodeToolBoss.ErrorCode<>nil then begin if CodeToolBoss.ErrorCode<>nil then begin
SourceNotebook.AddJumpPointClicked(Self); SourceNotebook.AddJumpPointClicked(Self);
ErrorCaret:=Point(CodeToolBoss.ErrorColumn,CodeToolBoss.ErrorLine); ErrorCaret:=Point(CodeToolBoss.ErrorColumn,CodeToolBoss.ErrorLine);
writeln('TMainIDE.DoJumpToCodeToolBossError B ',CodeToolBoss.ErrorCode.Filename,' ',CodeToolBoss.ErrorCode.IsVirtual); ErrorFilename:=CodeToolBoss.ErrorCode.Filename;
ErrorTopLine:=CodeToolBoss.ErrorTopLine;
writeln('TMainIDE.DoJumpToCodeToolBossError B ',ErrorFilename,' ',CodeToolBoss.ErrorCode.IsVirtual);
OpenFlags:=[ofOnlyIfExists,ofUseCache]; OpenFlags:=[ofOnlyIfExists,ofUseCache];
if CodeToolBoss.ErrorCode.IsVirtual then if CodeToolBoss.ErrorCode.IsVirtual then
Include(OpenFlags,ofVirtualFile); Include(OpenFlags,ofVirtualFile);
if DoOpenEditorFile(CodeToolBoss.ErrorCode.Filename,-1,OpenFlags)=mrOk if DoOpenEditorFile(ErrorFilename,-1,OpenFlags)=mrOk
then begin then begin
writeln('TMainIDE.DoJumpToCodeToolBossError C ',CodeToolBoss.ErrorCode.Filename,' ',CodeToolBoss.ErrorCode.IsVirtual); writeln('TMainIDE.DoJumpToCodeToolBossError C ',ErrorFilename);
ActiveSrcEdit:=SourceNoteBook.GetActiveSE; ActiveSrcEdit:=SourceNoteBook.GetActiveSE;
MessagesView.ShowOnTop; MessagesView.ShowOnTop;
SourceNoteBook.ShowOnTop; SourceNoteBook.ShowOnTop;
@ -8796,8 +8800,8 @@ writeln('TMainIDE.DoJumpToCodeToolBossError C ',CodeToolBoss.ErrorCode.Filename,
CaretXY:=ErrorCaret; CaretXY:=ErrorCaret;
BlockBegin:=CaretXY; BlockBegin:=CaretXY;
BlockEnd:=CaretXY; BlockEnd:=CaretXY;
if CodeToolBoss.ErrorTopLine>0 then if ErrorTopLine>0 then
TopLine:=CodeToolBoss.ErrorTopLine; TopLine:=ErrorTopLine;
end; end;
SourceNotebook.FocusEditor; SourceNotebook.FocusEditor;
SourceNotebook.ClearErrorLines; SourceNotebook.ClearErrorLines;
@ -10267,6 +10271,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.698 2004/01/11 11:32:46 mattias
updates defines for fpc 1.9.2
Revision 1.697 2004/01/09 15:20:38 mattias Revision 1.697 2004/01/09 15:20:38 mattias
fixed close editor shortcut fixed close editor shortcut