[vlc-devel] commit: Win32: link libvlccore with the resource file ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Aug 24 17:30:28 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Aug 24 18:32:49 2008 +0300| [aa266132517cc372e6e41857e3452e7a4d285fe8] | committer: Rémi Denis-Courmont 

Win32: link libvlccore with the resource file

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

 src/Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 84bfbe6..27f3ccb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -183,10 +183,13 @@ 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_lib)
-libvlccore_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
+libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
 
+libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
 libvlc_la_LIBADD = libvlccore.la
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \




More information about the vlc-devel mailing list