Manually add Windows 10 compat manifest to the installer, to make Aero plug-in work correctly on Windows 10.

This commit is contained in:
LoRd_MuldeR 2015-10-10 15:56:33 +02:00
parent 4760d6e756
commit acc791529b
4 changed files with 16 additions and 2 deletions

2
.gitignore vendored
View File

@ -27,3 +27,5 @@
/etc/Prerequisites/keccak/obj /etc/Prerequisites/keccak/obj
/etc/Prerequisites/_old_ /etc/Prerequisites/_old_
/res/tools/_old_ /res/tools/_old_
/etc/Utilities/*.ini
/etc/Utilities/*.log

2
etc/NSIS/setup.manifest Normal file
View File

@ -0,0 +1,2 @@
<?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="Nullsoft.NSIS.exehead" type="win32"/><description>Nullsoft Install System</description><dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="requireAdministrator" uiAccess="false"/></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/></application></compatibility></assembly>

View File

@ -80,6 +80,16 @@
!endif !endif
;--------------------------------
;Manifest
;--------------------------------
!packhdr "$%TEMP%\~exehead.tmp" `"..\Utilities\ResHacker.exe" -addoverwrite "$%TEMP%\~exehead.tmp", "$%TEMP%\~exehead.tmp", "setup.manifest", 24,1,1033`
!delfile "..\Utilities\ResHacker.log"
!delfile "..\Utilities\ResHacker.ini"
;-------------------------------- ;--------------------------------
;Includes ;Includes
;-------------------------------- ;--------------------------------
@ -111,7 +121,7 @@ InstallDirRegKey HKLM "${MyRegPath}" "InstallLocation"
SetCompressor /SOLID LZMA SetCompressor /SOLID LZMA
SetCompressorDictSize 64 SetCompressorDictSize 64
!packhdr "$%TEMP%\exehead.tmp" '"${LAMEXP_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"' #!packhdr "$%TEMP%\exehead.tmp" '"${LAMEXP_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"'
;-------------------------------- ;--------------------------------

View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE RC #define VER_LAMEXP_TYPE RC
#define VER_LAMEXP_PATCH 1 #define VER_LAMEXP_PATCH 1
#define VER_LAMEXP_BUILD 1804 #define VER_LAMEXP_BUILD 1805
#define VER_LAMEXP_CONFG 1700 #define VER_LAMEXP_CONFG 1700
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////