From 502db837cf8e14a8f92b7e43a4f306d70b7f136f Mon Sep 17 00:00:00 2001
From: Edward Wang <edward.c.wang@compdigitec.com>
Date: Wed, 14 Mar 2012 18:02:19 -0400
Subject: [PATCH] Embed manifest files as Windows PE resource

Close #3335

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
 bin/Makefile.am           | 2 +-
 bin/vlc_win32_rc.rc.in    | 1 +
 src/Makefile.am           | 2 +-
 src/libvlc_win32_rc.rc.in | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 832d4825c1bb6..20021954c5e1f 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -57,7 +57,7 @@ vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in
 	$(SHELL) ./config.status --file="bin/$@"
 
 vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
+	$(WINDRES) --include-dir $(top_srcdir)/share/icons --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
diff --git a/bin/vlc_win32_rc.rc.in b/bin/vlc_win32_rc.rc.in
index 796151ba620fd..217da24c5eaa6 100644
--- a/bin/vlc_win32_rc.rc.in
+++ b/bin/vlc_win32_rc.rc.in
@@ -30,3 +30,4 @@ BEGIN
   END
 END
 
+2 RT_MANIFEST "vlc.exe.manifest"
diff --git a/src/Makefile.am b/src/Makefile.am
index 81b01fb44f73f..a8cecab9fa7a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -191,7 +191,7 @@ libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version
 endif
 
 libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+	$(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_darwin) \
diff --git a/src/libvlc_win32_rc.rc.in b/src/libvlc_win32_rc.rc.in
index 0ac9882128e21..d4784ec86da88 100644
--- a/src/libvlc_win32_rc.rc.in
+++ b/src/libvlc_win32_rc.rc.in
@@ -26,3 +26,4 @@ BEGIN
   END
 END
 
+2 RT_MANIFEST "libvlc.dll.manifest"