[vlc-devel] commit: win32: no need of an icon for the dll (Christophe Mutricy )

[git version control]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Mon Aug  4 22:36:38 2008 +0100| [20a89568cc178b510e2bd6f4e33b3de0ba9f9b40] | committer: Christophe Mutricy 

win32: no need of an icon for the dll

Save 2 x 85ko

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=20a89568cc178b510e2bd6f4e33b3de0ba9f9b40
---

 configure.ac                |    1 +
 share/Makefile.am           |    3 ++-
 share/libvlc_win32_rc.rc.in |   24 ++++++++++++++++++++++++
 src/Makefile.am             |   16 ++++++++++------
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9ab51f8..69532b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5806,6 +5806,7 @@ AC_CONFIG_FILES([
   projects/mozilla/npvlc_rc.rc
   share/Makefile
   share/vlc_win32_rc.rc
+  share/libvlc_win32_rc.rc
   src/Makefile
   test/Makefile
 ])
diff --git a/share/Makefile.am b/share/Makefile.am
index 6e5a767..5a52bfc 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -60,7 +60,8 @@ DIST_rsrc = \
 	resource.h \
 	vlc_wince_rc.rc \
 	vlc_beos.rsrc \
-	vlc_win32_rc.rc
+	vlc_win32_rc.rc.in \
+	libvlc_win32_rc.rc.in
 
 DIST_pda = \
 	pda-forwardb16x16.xpm \
diff --git a/share/libvlc_win32_rc.rc.in b/share/libvlc_win32_rc.rc.in
new file mode 100644
index 0000000..ecd58a1
--- /dev/null
+++ b/share/libvlc_win32_rc.rc.in
@@ -0,0 +1,24 @@
+#define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at 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
+
diff --git a/src/Makefile.am b/src/Makefile.am
index c439480..28eab41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
-libvlccore_la_DEPENDENCIES += $(DATA_win32_rc)
-libvlccore_la_LDFLAGS += -Wl,$(DATA_win32_rc)
+libvlccore_la_DEPENDENCIES += $(DATA_win32_rc_lib)
+libvlccore_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
 endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
@@ -195,8 +195,8 @@ libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
-libvlc_la_DEPENDENCIES += $(DATA_win32_rc)
-libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc)
+libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib)
+libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
 endif
 
 
@@ -477,11 +477,15 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
 	eval $$cmd
 
 if HAVE_WIN32
-DATA_win32_rc = $(noinst_DATA)
-noinst_DATA = vlc_win32_rc.$(OBJEXT)
+DATA_win32_rc = 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
 	$(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