[vlc-commits] [Git][videolan/npapi-vlc][master] Bundle manifest with DLLs

[Hugo Beauzée-Luyssen]

Hugo Beauzée-Luyssen pushed to branch master at videolan / VLC Browser Plugins


Commits:
b67f05a6 by Hugo Beauzée-Luyssen at 2017-03-08T17:59:46+01:00
Bundle manifest with DLLs

- - - - -


5 changed files:

- activex/Makefile.am
- activex/axvlc_rc.rc.in
- npapi/Makefile.am
- npapi/gen-vlc-r-in
- npapi/package/npvlc_rc.rc.in


Changes:

=====================================
activex/Makefile.am
=====================================
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -79,7 +79,7 @@ axvlc_la_LIBADD = ../common/libvlcplugin_common.la \
 DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
 noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
 noinst_axvlc_rcdir = 
-axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb
+axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb axvlc.dll.manifest
 	$(WINDRES) --include-dir $(srcdir) -i $< -o $@
 
 


=====================================
activex/axvlc_rc.rc.in
=====================================
--- a/activex/axvlc_rc.rc.in
+++ b/activex/axvlc_rc.rc.in
@@ -1,5 +1,7 @@
 #define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA_RC@
 
+#include <winuser.h>
+
 1 BITMAP "vlc16x16.bmp"
 1 VERSIONINFO
  FILEOS 0x4L
@@ -42,3 +44,4 @@ END
 
 1 TYPELIB "axvlc.tlb"
 
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "axvlc.dll.manifest"


=====================================
npapi/Makefile.am
=====================================
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -106,8 +106,8 @@ npvlc_la_LIBADD += -lgdi32
 DATA_npvlc_rc = $(noinst_DATA)
 noinst_DATA = npvlc_rc.$(OBJEXT)
 
-npvlc_rc.$(OBJEXT): package/npvlc_rc.rc
-	$(WINDRES) --include-dir $(srcdir) -i $< -o $@
+npvlc_rc.$(OBJEXT): package/npvlc_rc.rc package/npvlc.dll.manifest
+	$(WINDRES) --include-dir $(srcdir) --include-dir $(srcdir)/package -i $< -o $@
 
 endif
 


=====================================
npapi/gen-vlc-r-in
=====================================
--- a/npapi/gen-vlc-r-in
+++ b/npapi/gen-vlc-r-in
@@ -75,6 +75,8 @@ winfile() {
 //
 #define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA_RC@
 
+#include <winuser.h>
+
 //VS_VERSION_INFO VERSIONINFO
 1 VERSIONINFO
  FILEVERSION VERSION_NUMBER
@@ -121,6 +123,8 @@ END
 7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp"
 8 ICON   DISCARDABLE "../share/pixmaps/win32/vlc.ico"
 9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp"
+
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest"
 EOF
 }
 


=====================================
npapi/package/npvlc_rc.rc.in
=====================================
--- a/npapi/package/npvlc_rc.rc.in
+++ b/npapi/package/npvlc_rc.rc.in
@@ -4,6 +4,8 @@
 //
 #define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA_RC@
 
+#include <winuser.h>
+
 //VS_VERSION_INFO VERSIONINFO
 1 VERSIONINFO
  FILEVERSION VERSION_NUMBER
@@ -50,3 +52,5 @@ END
 7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp"
 8 ICON   DISCARDABLE "../share/pixmaps/win32/vlc.ico"
 9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp"
+
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest"



View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/commit/b67f05a6c9cf38e81cde9267329ebb52d7f7ff94