Mercurial > mplayer.hg

diff TOOLS/Makefile @ 26333:701c023d18c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for latest changes to linking dependencies.
author diego
date Wed, 09 Apr 2008 16:39:07 +0000
parents 2118c88fe0e1
children b7732b0221ed
line wrap: on
line diff
--- a/TOOLS/Makefile	Wed Apr 09 15:19:55 2008 +0000
+++ b/TOOLS/Makefile	Wed Apr 09 16:39:07 2008 +0000
@@ -13,7 +13,8 @@
 	subrip$(EXESUF) \
 #	vivodump$(EXESUF) \
 
-COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a -ltermcap -lm
+COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) \
+              -ltermcap -lm
 
 all: $(OBJS)
 
@@ -24,8 +25,7 @@
 
 #FIXME: Linking is broken, help welcome.
 vivodump$(EXESUF): vivodump.c
-	$(CC) $(CFLAGS) -o $@ $< ../libmpdemux/libmpdemux.a \
-          ../stream/stream.a $(COMMON_LIBS)
+	$(CC) $(CFLAGS) -o $@ $< ../libmpdemux/libmpdemux.a $(COMMON_LIBS)
 
 fastmemcpybench: fastmemcpybench.c
 	$(CC) $(CFLAGS) $< -o fastmem-mmx$(EXESUF)  -DNAME=\"mmx\"      -DHAVE_MMX