diff --git a/.gitattributes b/.gitattributes index 1b3487daf5..0b7d28215b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3566,7 +3566,7 @@ ide/keymapshortcutdlg.pas svneol=native#text/plain ide/lazarus.ico -text svneol=unset#image/ico ide/lazarus.lpi svneol=native#text/plain ide/lazarus.pp svneol=native#text/pascal -ide/lazarus.rc svneol=CRLF#text/plain eol=crlf +ide/lazarus.res -text ide/lazarus_about_logo.lrs svneol=native#text/pascal ide/lazarus_dci.lrs svneol=native#text/pascal ide/lazarus_indentation.lrs svneol=native#text/plain diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi index 3d5e6f2d15..b261fd678e 100644 --- a/ide/lazarus.lpi +++ b/ide/lazarus.lpi @@ -14,6 +14,7 @@ + <ResourceType Value="res"/> <Icon Value="0"/> <UseXPManifest Value="True"/> </General> diff --git a/ide/lazarus.manifest b/ide/lazarus.manifest deleted file mode 100644 index 7a2c902c8f..0000000000 --- a/ide/lazarus.manifest +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="CompanyName.ProductName.YourApp" type="win32"/> - <description>Your application description here.</description> - <dependency> - <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/> - </dependentAssembly> - </dependency> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> - <security> - <requestedPrivileges> - <requestedExecutionLevel level="asInvoker" uiAccess="false"/> - </requestedPrivileges> - </security> - </trustInfo> -</assembly> \ No newline at end of file diff --git a/ide/lazarus.pp b/ide/lazarus.pp index 2cc36f7856..1c1f1fabec 100644 --- a/ide/lazarus.pp +++ b/ide/lazarus.pp @@ -36,10 +36,6 @@ program Lazarus; {$I ide.inc} -{$IFDEF WINDOWS} - {$R lazarus.rc} -{$ENDIF} - {off $DEFINE IDE_MEM_CHECK} uses @@ -79,6 +75,7 @@ uses MainBase, compiler_conditionals_options; {$I revision.inc} +{$R lazarus.res} begin {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('lazarus.pp: begin');{$ENDIF} diff --git a/ide/lazarus.rc b/ide/lazarus.rc deleted file mode 100644 index e99ea97bc9..0000000000 --- a/ide/lazarus.rc +++ /dev/null @@ -1,7 +0,0 @@ -#define RT_MANIFEST 24 -#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 -#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 -#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "lazarus.manifest" -MAINICON ICON "lazarus.ico" diff --git a/ide/lazarus.res b/ide/lazarus.res new file mode 100644 index 0000000000..a7df573cd9 Binary files /dev/null and b/ide/lazarus.res differ