# HG changeset patch # User diego # Date 1174091200 0 # Node ID 8dd976be3f254a697b4c6805d3b4f82ea2832ca9 # Parent 8421df47e611580febb868ce035a2a8a7caef41a Bring netstream somewhat closer to linking, still won't work. diff -r 8421df47e611 -r 8dd976be3f25 TOOLS/netstream/Makefile --- a/TOOLS/netstream/Makefile Sat Mar 17 00:21:16 2007 +0000 +++ b/TOOLS/netstream/Makefile Sat Mar 17 00:26:40 2007 +0000 @@ -8,10 +8,11 @@ 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 @@ $(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