diff --git a/.gitignore b/.gitignore index 1e197749..aa7c5bfc 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /etc/Prerequisites/keccak/obj /etc/Prerequisites/_old_ /res/tools/_old_ +/etc/Utilities/*.ini +/etc/Utilities/*.log diff --git a/etc/NSIS/setup.manifest b/etc/NSIS/setup.manifest new file mode 100644 index 00000000..542ddcc9 --- /dev/null +++ b/etc/NSIS/setup.manifest @@ -0,0 +1,2 @@ + +Nullsoft Install System \ No newline at end of file diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 5080352a..05c04cba 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -80,6 +80,16 @@ !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 ;-------------------------------- @@ -111,7 +121,7 @@ InstallDirRegKey HKLM "${MyRegPath}" "InstallLocation" SetCompressor /SOLID LZMA 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"' ;-------------------------------- diff --git a/src/Config.h b/src/Config.h index bf876e4d..94d0c925 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_TYPE RC #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 1804 +#define VER_LAMEXP_BUILD 1805 #define VER_LAMEXP_CONFG 1700 ///////////////////////////////////////////////////////////////////////////////