ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from oddMLan/Manifest_generation_fix 

Fix manifest file not being embedded into the Project64 executable
This commit is contained in:
zilmar 2015-02-16 17:24:09 +11:00
parent b42fcd6434 e0ecffe5c1
commit 849de141fb
3 changed files with 370 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Source/Project64/Project64.exe.manifest
View File

@ -1,22 +1,28 @@
<?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="x86"
name="Project64.XP"
type="win32"
/>
<description>Project64</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="X86"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<trustInfo xmlns='urn:schemas-microsoft-com:asm.v3'>
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
<assemblyIdentity
version='2.1.0.1'
processorArchitecture='x86'
name='Project64'
type='win32'
/>
<dependency>
<dependentAssembly>
<assemblyIdentity
type='win32'
name='Microsoft.Windows.Common-Controls'
version='6.0.0.0'
processorArchitecture='X86'
publicKeyToken='6595b64144ccf1df'
language='*'
/>
</dependentAssembly>
</dependency>
</assembly>

16
Source/Project64/Project64.vcxproj
View File

@ -34,12 +34,28 @@
<PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<DataExecutionPrevention>false</DataExecutionPrevention>
<MinimumRequiredVersion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Windows</SubSystem>
<ManifestFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<AllowIsolation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<EnableUAC Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<UACExecutionLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<UACUIAccess Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<ManifestFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<AllowIsolation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<EnableUAC Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<UACExecutionLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<UACUIAccess Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</Link>
</ItemDefinitionGroup>
<ItemGroup>

2
Source/Project64/User Interface/UI Resources.rc
View File

@ -17,6 +17,8 @@
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\Project64.exe.manifest"
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US