Author: diego Date: Sat Mar 17 01:26:40 2007 New Revision: 22657 Modified: trunk/TOOLS/netstream/Makefile Log: Bring netstream somewhat closer to linking, still won't work. Modified: trunk/TOOLS/netstream/Makefile ============================================================================== --- trunk/TOOLS/netstream/Makefile (original) +++ trunk/TOOLS/netstream/Makefile Sat Mar 17 01:26:40 2007 @@ -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