Commit b67f05a6 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Bundle manifest with DLLs

parent 343f6588
...@@ -79,7 +79,7 @@ axvlc_la_LIBADD = ../common/libvlcplugin_common.la \ ...@@ -79,7 +79,7 @@ axvlc_la_LIBADD = ../common/libvlcplugin_common.la \
DATA_axvlc_rc = $(noinst_axvlc_rc_DATA) DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT) noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
noinst_axvlc_rcdir = 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 $@ $(WINDRES) --include-dir $(srcdir) -i $< -o $@
......
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@ #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
#include <winuser.h>
1 BITMAP "vlc16x16.bmp" 1 BITMAP "vlc16x16.bmp"
1 VERSIONINFO 1 VERSIONINFO
FILEOS 0x4L FILEOS 0x4L
...@@ -42,3 +44,4 @@ END ...@@ -42,3 +44,4 @@ END
1 TYPELIB "axvlc.tlb" 1 TYPELIB "axvlc.tlb"
ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "axvlc.dll.manifest"
...@@ -106,8 +106,8 @@ npvlc_la_LIBADD += -lgdi32 ...@@ -106,8 +106,8 @@ npvlc_la_LIBADD += -lgdi32
DATA_npvlc_rc = $(noinst_DATA) DATA_npvlc_rc = $(noinst_DATA)
noinst_DATA = npvlc_rc.$(OBJEXT) noinst_DATA = npvlc_rc.$(OBJEXT)
npvlc_rc.$(OBJEXT): package/npvlc_rc.rc npvlc_rc.$(OBJEXT): package/npvlc_rc.rc package/npvlc.dll.manifest
$(WINDRES) --include-dir $(srcdir) -i $< -o $@ $(WINDRES) --include-dir $(srcdir) --include-dir $(srcdir)/package -i $< -o $@
endif endif
......
...@@ -75,6 +75,8 @@ winfile() { ...@@ -75,6 +75,8 @@ winfile() {
// //
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@ #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
#include <winuser.h>
//VS_VERSION_INFO VERSIONINFO //VS_VERSION_INFO VERSIONINFO
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION VERSION_NUMBER FILEVERSION VERSION_NUMBER
...@@ -121,6 +123,8 @@ END ...@@ -121,6 +123,8 @@ END
7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" 7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp"
8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" 8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico"
9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" 9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp"
ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest"
EOF EOF
} }
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
// //
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@ #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
#include <winuser.h>
//VS_VERSION_INFO VERSIONINFO //VS_VERSION_INFO VERSIONINFO
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION VERSION_NUMBER FILEVERSION VERSION_NUMBER
...@@ -50,3 +52,5 @@ END ...@@ -50,3 +52,5 @@ END
7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" 7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp"
8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" 8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico"
9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" 9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp"
ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment