Embed manifest files as Windows PE resource

Close #3335

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 832d4825c1bb64e817e900bc61b217c2f7a789fc..20021954c5e1f8217c006448e08bee5861c17e36 100644 (file)
--- 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 796151ba620fdaf240d0d15e7df9c7dbc6dd1532..217da24c5eaa6ce5900c67b0e57227953e1cbde9 100644 (file)
--- 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 81b01fb44f73f9c5b6a8df23b949d4532f556d90..a8cecab9fa7a0d3985baedc23c563f161f53fb85 100644 (file)
--- 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 0ac9882128e21b1dcb87dbd30110821766d80d5e..d4784ec86da88b4a7ec3c00ffee38d319784558e 100644 (file)
--- 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"