X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=92e687940df3c3a90d6a88edd305b6b83ba039c1;hb=3d2ef5f961a59b44fc7e966608c6a4a196fdba54;hp=2bb42944ff6e31f984e436cc0a7643f36eb20a1d;hpb=b3a59c07e71c74191c2d1524dbd2f5412dd762db;p=vlc

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2bb42944ff..92e687940d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -14,7 +14,7 @@ AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if !HAVE_WIN32
 if !HAVE_WINCE
 bin_PROGRAMS += vlc-wrapper
-vlc_SOURCES = vlc.c
+vlc_SOURCES = vlc.c override.c
 endif
 endif
 
@@ -46,6 +46,8 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
 if HAVE_WIN32
 vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
 vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
+else
+vlc_LDADD += $(LIBDL)
 endif
 
 .rc.in.rc: $(top_builddir)/config.status
@@ -53,7 +55,7 @@ endif
 	$(SHELL) ./config.status --file="bin/$@"
 
 vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+	$(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
 
 vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \