summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-09 16:39:07 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-09 16:39:07 +0000
commitad908d519893b7c8dc39e77e53f2539d2a444cfd (patch)
tree628653f76cbffd687733cf1739ed1117fdbd92bf /TOOLS
parent4bcb2a5baf46f3bc254b6493102621688e2ac9cf (diff)
downloadmpv-ad908d519893b7c8dc39e77e53f2539d2a444cfd.tar.bz2
mpv-ad908d519893b7c8dc39e77e53f2539d2a444cfd.tar.xz
Update for latest changes to linking dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26365 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
-rw-r--r--TOOLS/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/TOOLS/Makefile b/TOOLS/Makefile
index 747327d778..0921316b1c 100644
--- a/TOOLS/Makefile
+++ b/TOOLS/Makefile
@@ -13,7 +13,8 @@ OBJS = alaw-gen$(EXESUF) \
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 @@ subrip$(EXESUF): subrip.c
#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