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

ide: don't write icon to .lrs file since .res can be used everywhere

Browse Source 
git-svn-id: trunk@23382 -
This commit is contained in:
paul 2010-01-05 10:43:22 +00:00
parent f6928e6ddc
commit fc53888ae2
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/projecticon.pas
View File

@ -109,7 +109,7 @@ begin
if FilenameIsAbsolute(FIcoFileName) then if FilenameIsAbsolute(FIcoFileName) then
CreateIconFile; CreateIconFile;
// don't add icon to lazarus resources if we are using fpc resources { to create an lrs with icon we can use this but there is no reason anymore
if AResources.ResourceType <> rtRes then if AResources.ResourceType <> rtRes then
begin begin
AResource := GetStream; AResource := GetStream;
@ -119,6 +119,7 @@ begin
AResource.Free; AResource.Free;
end; end;
end; end;
}
AName := TResourceDesc.Create('MAINICON'); AName := TResourceDesc.Create('MAINICON');
ARes := TGroupIconResource.Create(nil, AName); //type is always RT_GROUP_ICON ARes := TGroupIconResource.Create(nil, AName); //type is always RT_GROUP_ICON

8
ide/projectresources.pas
View File

@ -598,13 +598,7 @@ begin
else else
if HasSystemResources then if HasSystemResources then
begin begin
// if we are using fpc resources only we need to compile them on all systems Directive := '{$R '+Filename+'}';
// since we have no other way to get them. If LRS are used then we can
// skip compiling of rc on other than windows systems
case ResourceType of
rtLRS: Directive := '{$IFDEF WINDOWS}{$R '+Filename+'}{$ENDIF}';
rtRes: Directive := '{$R '+Filename+'}';
end;
if not CodeToolBoss.AddResourceDirective(CodeBuf, Filename, false, Directive) then if not CodeToolBoss.AddResourceDirective(CodeBuf, Filename, false, Directive) then
begin begin
Result := False; Result := False;