summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-17 00:26:40 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-17 00:26:40 +0000
commit1d202f4de6e16b69f2629d7dde133cc01f6912b6 (patch)
treedb7044b38e097bc976c96345baa5dc4ac92e11c2 /TOOLS
parentd23df55976b8861ebd0d5657988162c8ff164f72 (diff)
downloadmpv-1d202f4de6e16b69f2629d7dde133cc01f6912b6.tar.bz2
mpv-1d202f4de6e16b69f2629d7dde133cc01f6912b6.tar.xz
Bring netstream somewhat closer to linking, still won't work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22657 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
-rw-r--r--TOOLS/netstream/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile
index e50b5ba84b..30fd2d44b9 100644
--- a/TOOLS/netstream/Makefile
+++ b/TOOLS/netstream/Makefile
@@ -8,10 +8,11 @@ CFLAGS = $(OPTFLAGS) -I$(MPROOT)
all: netstream
# FIXME: linking is a mess that should be fixed properly some day
-# it does not work with either GUI, LIVE555 or libavformat enabled
+# it does not work with either GUI, LIVE555, libavformat, cdparanoia enabled
DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
$(MPROOT)/stream/stream.a \
$(MPROOT)/dvdread/libdvdread.a \
+ $(MPROOT)/libdvdcss/libdvdcss.a \
$(MPROOT)/libvo/aclib.o \
$(MPROOT)/libmpcodecs/img_format.o \
$(MPROOT)/liba52/liba52.a \
@@ -21,8 +22,9 @@ DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
$(MPROOT)/mp_msg.o \
$(MPROOT)/osdep/shmem.o \
$(MPROOT)/osdep/timer-*.o \
- $(MPROOT)/osdep/strl.o \
- -lm \
+ $(MPROOT)/osdep/strlcpy.o \
+ $(MPROOT)/osdep/getch2.o \
+ -ltermcap -lm \
ifeq ($(TARGET_WIN32),yes)
DEPS += $(MPROOT)/osdep/glob-win.o -lwsock32