1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00

Supply Audacity.exe.manifest instead of generating it.

This commit is contained in:
Henric Jungheim 2017-11-07 07:09:56 -07:00 committed by Paul Licameli
parent bf30c6198c
commit 0c88c8de88
4 changed files with 37 additions and 2 deletions

22
win/Audacity.exe.manifest Normal file
View File

@ -0,0 +1,22 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<assemblyIdentity
version="2.2.1.0"
processorArchitecture="*"
name="Audacity.Audacity.Audacity"
type="win32"
/>
<description>Audacity® Cross-Platform Sound Editor</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*' />
</dependentAssembly>
</dependency>
</assembly>

View File

@ -46,11 +46,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -1213,6 +1215,9 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /Y %(Identity) ..\..\$(IntDir)\Nyquist\%(Filename)%(Extension)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(IntDir)\Nyquist\%(Filename)%(Extension)</Outputs>
</CustomBuild>
<Manifest Include="..\..\Audacity.exe.manifest">
<SubType>Designer</SubType>
</Manifest>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="src">
@ -2339,4 +2339,9 @@
<Filter>plug-ins</Filter>
</copy>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\..\Audacity.exe.manifest">
<Filter>Resources</Filter>
</Manifest>
</ItemGroup>
</Project>

View File

@ -8,6 +8,9 @@ AudacityLogo ICON "darkaudacity.ico"
AudacityLogo ICON "audacity.ico"
#endif
#include <winuser.h>
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "Audacity.exe.manifest"
#include "wx/msw/wx.rc"
/////////////////////////////////////////////////////////////////////////////
//