[vlc-devel] [PATCH] Build system: Embed manifest files as Windows PE resource

[Edward Wang]

Close #3335
---
 Updated as per j-b's suggestion.

 bin/Makefile.am                  |    2 +-
 bin/vlc_win32_rc.rc.in           |    1 +
 extras/package/win32/package.mak |    2 +-
 src/Makefile.am                  |    2 +-
 src/libvlc_win32_rc.rc.in        |    1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 832d482..2002195 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 796151b..217da24 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/extras/package/win32/package.mak b/extras/package/win32/package.mak
index abf0bb1..a173f33 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -35,7 +35,7 @@ package-win-common: package-win-install build-npapi
 
 # Executables, major libs+manifests
 	find $(prefix) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \;
-	cd $(top_srcdir)/extras/package/win32 && cp vlc$(EXEEXT).manifest libvlc$(LIBEXT).manifest "$(win32_destdir)/"
+#	cd $(top_srcdir)/extras/package/win32 && cp vlc$(EXEEXT).manifest libvlc$(LIBEXT).manifest "$(win32_destdir)/"
 
 # Text files, clean them from mail addresses
 	for file in AUTHORS THANKS ; \
diff --git a/src/Makefile.am b/src/Makefile.am
index 81b01fb..a8cecab 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 0ac9882..d4784ec 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"
-- 
1.7.5.4