diff --git a/extras/package/win32/libvlccore.dll.manifest b/extras/package/win32/libvlccore.dll.manifest new file mode 100644 index 0000000000..05bd9b1d9f --- /dev/null +++ b/extras/package/win32/libvlccore.dll.manifest @@ -0,0 +1,20 @@ + + + + LibVLC + + + + + + + + + + + diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak index 5c88bf79a9..10eb76bc64 100644 --- a/extras/package/win32/package.mak +++ b/extras/package/win32/package.mak @@ -187,6 +187,7 @@ package-wince: package-win-strip EXTRA_DIST += \ extras/package/win32/vlc.exe.manifest \ extras/package/win32/libvlc.dll.manifest \ + extras/package/win32/libvlccore.dll.manifest \ extras/package/win32/configure.sh \ extras/package/win32/NSIS/vlc.win32.nsi.in \ extras/package/win32/NSIS/spad.nsi.in \ diff --git a/src/.gitignore b/src/.gitignore index 13f18ff674..943d272ea9 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,6 +1,6 @@ test_* fourcc_gen fourcc_tables.h -libvlc_win32_rc.rc +libvlccore_win32_rc.rc revision.c revision.txt diff --git a/src/Makefile.am b/src/Makefile.am index c2f8ba66b6..f3577bea4c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -168,11 +168,11 @@ vlc-plugin.pc: vlc-plugin.pc.in $(top_builddir)/config.status ############################################################################## if HAVE_WIN32 -noinst_DATA = libvlc_win32_rc.rc +noinst_DATA = libvlccore_win32_rc.rc endif -EXTRA_DIST += libvlc_win32_rc.rc.in +EXTRA_DIST += libvlccore_win32_rc.rc.in -libvlc_win32_rc.rc: libvlc_win32_rc.rc.in $(top_builddir)/config.status +libvlccore_win32_rc.rc: libvlccore_win32_rc.rc.in $(top_builddir)/config.status $(AM_V_GEN)cd "$(top_builddir)" && \ $(SHELL) ./config.status --file="src/$@" @@ -558,8 +558,8 @@ libvlccore_la_LDFLAGS = \ -version-info 9:0:0 libvlccore_la_DEPENDENCIES = libvlccore.sym if HAVE_WIN32 -libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) -libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static +libvlccore_la_DEPENDENCIES += libvlccore_win32_rc.$(OBJEXT) +libvlccore_la_LDFLAGS += -Wl,libvlccore_win32_rc.$(OBJEXT) -avoid-version -Wc,-static endif if HAVE_OS2 libvlccore_la_LDFLAGS += -avoid-version @@ -584,7 +584,7 @@ if HAVE_TVOS libvlccore_la_LDFLAGS += -avoid-version endif -libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlc.dll.manifest +libvlccore_win32_rc.$(OBJEXT): libvlccore_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlccore.dll.manifest $(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@ # FourCC tables diff --git a/src/libvlccore_win32_rc.rc.in b/src/libvlccore_win32_rc.rc.in new file mode 100644 index 0000000000..5f14cd9b0a --- /dev/null +++ b/src/libvlccore_win32_rc.rc.in @@ -0,0 +1,31 @@ +#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@ +#define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@" + +#include + +1 VERSIONINFO +FILETYPE 2 +FILEOS 4 +PRODUCTVERSION VERSION_NUMBER +FILEVERSION VERSION_NUMBER +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "VideoLAN" + VALUE "ProductName", "VLC media player" + VALUE "ProductVersion", VERSION_NUMBER_STR + VALUE "FileVersion", "@VERSION@" + VALUE "FileDescription", "VLC media player" + VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors" + VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "libvlccore.dll.manifest"