Skip to content

Commit

Permalink
Embed manifest files as Windows PE resource
Browse files Browse the repository at this point in the history
Close #3335

Signed-off-by: Jean-Baptiste Kempf <[email protected]>
edwardcwang authored and jbkempf committed Mar 15, 2012
1 parent 0891bbe commit 502db83
Showing 4 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bin/Makefile.am
Original file line number Diff line number Diff line change
@@ -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 = \
1 change: 1 addition & 0 deletions bin/vlc_win32_rc.rc.in
Original file line number Diff line number Diff line change
@@ -30,3 +30,4 @@ BEGIN
END
END

2 RT_MANIFEST "vlc.exe.manifest"
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
@@ -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) \
1 change: 1 addition & 0 deletions src/libvlc_win32_rc.rc.in
Original file line number Diff line number Diff line change
@@ -26,3 +26,4 @@ BEGIN
END
END

2 RT_MANIFEST "libvlc.dll.manifest"

0 comments on commit 502db83

Please sign in to comment.