Commit 20a89568 authored by Christophe Mutricy's avatar Christophe Mutricy

win32: no need of an icon for the dll

Save 2 x 85ko
parent 2f09fc88
...@@ -5806,6 +5806,7 @@ AC_CONFIG_FILES([ ...@@ -5806,6 +5806,7 @@ AC_CONFIG_FILES([
projects/mozilla/npvlc_rc.rc projects/mozilla/npvlc_rc.rc
share/Makefile share/Makefile
share/vlc_win32_rc.rc share/vlc_win32_rc.rc
share/libvlc_win32_rc.rc
src/Makefile src/Makefile
test/Makefile test/Makefile
]) ])
......
...@@ -60,7 +60,8 @@ DIST_rsrc = \ ...@@ -60,7 +60,8 @@ DIST_rsrc = \
resource.h \ resource.h \
vlc_wince_rc.rc \ vlc_wince_rc.rc \
vlc_beos.rsrc \ vlc_beos.rsrc \
vlc_win32_rc.rc vlc_win32_rc.rc.in \
libvlc_win32_rc.rc.in
DIST_pda = \ DIST_pda = \
pda-forwardb16x16.xpm \ pda-forwardb16x16.xpm \
......
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
1 VERSIONINFO
FILETYPE 1
FILEOS 4
PRODUCTVERSION VERSION_NUMBER
FILEVERSION VERSION_NUMBER
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "the VideoLAN Team"
VALUE "FileVersion", "@VERSION@"
VALUE "FileDescription", "VLC media player"
VALUE "LegalCopyright", "(c) @COPYRIGHT_YEARS@ the VideoLAN Team"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
...@@ -182,8 +182,8 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ ...@@ -182,8 +182,8 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
libvlccore_la_DEPENDENCIES = libvlccore.sym libvlccore_la_DEPENDENCIES = libvlccore.sym
if HAVE_WIN32 if HAVE_WIN32
libvlccore_la_DEPENDENCIES += $(DATA_win32_rc) libvlccore_la_DEPENDENCIES += $(DATA_win32_rc_lib)
libvlccore_la_LDFLAGS += -Wl,$(DATA_win32_rc) libvlccore_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
endif endif
libvlc_la_SOURCES = $(SOURCES_libvlc_control) libvlc_la_SOURCES = $(SOURCES_libvlc_control)
...@@ -195,8 +195,8 @@ libvlc_la_LDFLAGS = $(AM_LDFLAGS) \ ...@@ -195,8 +195,8 @@ libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
-export-symbols $(srcdir)/libvlc.sym -export-symbols $(srcdir)/libvlc.sym
libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
if HAVE_WIN32 if HAVE_WIN32
libvlc_la_DEPENDENCIES += $(DATA_win32_rc) libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib)
libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc) libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
endif endif
...@@ -477,11 +477,15 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) ...@@ -477,11 +477,15 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
eval $$cmd eval $$cmd
if HAVE_WIN32 if HAVE_WIN32
DATA_win32_rc = $(noinst_DATA) DATA_win32_rc = vlc_win32_rc.$(OBJEXT)
noinst_DATA = vlc_win32_rc.$(OBJEXT) DATA_win32_rc_lib = libvlc_win32_rc.$(OBJEXT)
noinst_DATA = $(DATA_win32_rc) $(DATA_win32_rc_lib)
vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
endif endif
endif endif
......
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