paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-23 13:28:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

lhelp: fixed compilation on windows

Browse Source 
* removed references to obsolete .lrs file, probably used previously for icon.
* update lhelp.rc to current generated version and added external manifest file.

git-svn-id: trunk@19786 -
This commit is contained in:
vincents 2009-05-03 18:02:26 +00:00
parent 11c966027b
commit 36b74cb321
5 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -57,6 +57,7 @@ components/chmhelp/lhelp/images/table_open.png -text
components/chmhelp/lhelp/lhelp.ico -text svneol=unset#image/icon components/chmhelp/lhelp/lhelp.ico -text svneol=unset#image/icon
components/chmhelp/lhelp/lhelp.lpi svneol=native#text/plain components/chmhelp/lhelp/lhelp.lpi svneol=native#text/plain
components/chmhelp/lhelp/lhelp.lpr svneol=native#text/plain components/chmhelp/lhelp/lhelp.lpr svneol=native#text/plain
components/chmhelp/lhelp/lhelp.manifest svneol=native#text/plain
components/chmhelp/lhelp/lhelp.rc svneol=native#text/plain components/chmhelp/lhelp/lhelp.rc svneol=native#text/plain
components/chmhelp/lhelp/lhelpcore.lfm svneol=native#text/plain components/chmhelp/lhelp/lhelpcore.lfm svneol=native#text/plain
components/chmhelp/lhelp/lhelpcore.lrs svneol=native#text/plain components/chmhelp/lhelp/lhelpcore.lrs svneol=native#text/plain

8
components/chmhelp/lhelp/lhelp.lpi
View File

@ -1,9 +1,11 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<PathDelim Value="/"/> <Version Value="7"/>
<Version Value="6"/>
<General> <General>
<Flags>
<LRSInOutputDirectory Value="False"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<TargetFileExt Value=""/> <TargetFileExt Value=""/>
@ -54,7 +56,6 @@
<Filename Value="chmpopup.pas"/> <Filename Value="chmpopup.pas"/>
<ComponentName Value="HelpPopupForm"/> <ComponentName Value="HelpPopupForm"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ResourceFilename Value="chmpopup.lrs"/>
<UnitName Value="ChmPopup"/> <UnitName Value="ChmPopup"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
@ -63,7 +64,6 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<ResourceFilename Value="lhelpcore.lrs"/>
<UnitName Value="lhelpcore"/> <UnitName Value="lhelpcore"/>
</Unit4> </Unit4>
<Unit5> <Unit5>

1
components/chmhelp/lhelp/lhelp.lpr
View File

@ -36,7 +36,6 @@ var
{$IFDEF WINDOWS}{$R lhelp.rc}{$ENDIF} {$IFDEF WINDOWS}{$R lhelp.rc}{$ENDIF}
begin begin
{$I lhelp.lrs}
Application.Initialize; Application.Initialize;
for X := 1 to ParamCount do for X := 1 to ParamCount do
if LowerCase(ParamStr(X)) = '--help' then if LowerCase(ParamStr(X)) = '--help' then

17
components/chmhelp/lhelp/lhelp.manifest Normal file
View File

@ -0,0 +1,17 @@
<?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>

21
components/chmhelp/lhelp/lhelp.rc
View File

@ -3,24 +3,5 @@
#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 #define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MOVEABLE PURE CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "lhelp.manifest"
{
"<?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>"
}
MAINICON ICON "lhelp.ico" MAINICON ICON "lhelp.ico"