win32: separate the libvlccore DLL files

libvlccore.dll should not be defined as libvlc.dll
This commit is contained in:
Steve Lhomme 2022-12-02 12:13:49 +01:00
parent 6f3685c982
commit 531d7e59e0
5 changed files with 59 additions and 7 deletions

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="libvlccore.dll"
type="win32"
/>
<description>LibVLC</description>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!--The ID below indicates application support for Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!--The ID below indicates app support for Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!--The ID below indicates app support for Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
</application>
</compatibility>
</assembly>

View File

@ -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 \

2
src/.gitignore vendored
View File

@ -1,6 +1,6 @@
test_*
fourcc_gen
fourcc_tables.h
libvlc_win32_rc.rc
libvlccore_win32_rc.rc
revision.c
revision.txt

View File

@ -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

View File

@ -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 <winuser.h>
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"