[vlc-commits] bin: win32 resources: Fix manifest embeding

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Mar  8 15:13:03 2017 +0100| [248983bd43ffb3c25417440acb18080caf3e3ea5] | committer: Jean-Baptiste Kempf

bin: win32 resources: Fix manifest embeding

RT_MANIFEST is a macro that wasn't being substituted
2 was the magic number that corresponds to
ISOLATIONAWARE_MANIFEST_RESOURCE_ID, which should be used for DLLs.
Instead, use CREATEPROCESS_MANIFEST_RESOURCE_ID as we are creating a
process

(cherry picked from commit 083b4c517b18c61ed9eb766551f26307be3949b1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=248983bd43ffb3c25417440acb18080caf3e3ea5
---

 bin/vlc_win32_rc.rc.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/vlc_win32_rc.rc.in b/bin/vlc_win32_rc.rc.in
index da77c6d..2fb1666 100644
--- a/bin/vlc_win32_rc.rc.in
+++ b/bin/vlc_win32_rc.rc.in
@@ -1,6 +1,8 @@
 #define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@
 #define VERSION_NUMBER_STR "@VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@"
 
+#include <winuser.h>
+
 VLC_ICON ICON "vlc.ico"
 
 1 VERSIONINFO
@@ -30,4 +32,4 @@ BEGIN
   END
 END
 
-2 RT_MANIFEST "vlc.exe.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "vlc.exe.manifest"