summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-16 23:44:28 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-16 23:44:28 +0000
commitd673f88115be5c245522c4a4b9bfd4e695f70b1e (patch)
treecf27a1db8b404aa182d53d3c4a71fdae78586b1d /TOOLS
parent4718dd69faec25882ea9ae7bab8f1562781f66bc (diff)
downloadmpv-d673f88115be5c245522c4a4b9bfd4e695f70b1e.tar.bz2
mpv-d673f88115be5c245522c4a4b9bfd4e695f70b1e.tar.xz
Bring vivodump closer to linking; remains broken.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22647 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
-rw-r--r--TOOLS/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/TOOLS/Makefile b/TOOLS/Makefile
index c28919b0cc..a60ff3d272 100644
--- a/TOOLS/Makefile
+++ b/TOOLS/Makefile
@@ -12,7 +12,7 @@ OBJS = alaw-gen$(EXESUF) \
movinfo$(EXESUF) \
png2raw$(EXESUF) \
subrip$(EXESUF) \
- vivodump$(EXESUF) \
+# vivodump$(EXESUF) \
302m_convert$(EXESUF) \
360m_convert$(EXESUF) \
@@ -30,8 +30,10 @@ subrip: subrip.c
../unrarlib.o ../libswscale/libswscale.a ../libavutil/libavutil.a \
../libmpcodecs/img_format.o ../osdep/getch2.o -ltermcap -lm
+#FIXME: Linking is broken, help welcome.
vivodump: vivodump.c
- $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a ../stream/stream.a
+ $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a \
+ ../stream/stream.a ../osdep/getch2.o -ltermcap -lm
fastmemcpybench: fastmemcpybench.c
$(CC) $(CFLAGS) -g $< -o fastmem-mmx$(EXESUF) ../libvo/aclib.o -DNAME=\"mmx\" -DHAVE_MMX