diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-01 09:39:32 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-01 09:39:32 +0000 |
| commit | c38e260ff824af6f9aa83aefc4b20cfd000e12a1 (patch) | |
| tree | 90213770de3ddb18c77cdc93c800e9bbed4d58c3 /TOOLS | |
| parent | 8bf84ebd469ae2024eaffc41e6ec37cef3d3c9e9 (diff) | |
| download | mpv-c38e260ff824af6f9aa83aefc4b20cfd000e12a1.tar.bz2 mpv-c38e260ff824af6f9aa83aefc4b20cfd000e12a1.tar.xz | |
Move netstream.c out of its single-file subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22873 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
| -rw-r--r-- | TOOLS/Makefile | 20 | ||||
| -rw-r--r-- | TOOLS/netstream.c (renamed from TOOLS/netstream/netstream.c) | 0 | ||||
| -rw-r--r-- | TOOLS/netstream/Makefile | 33 |
3 files changed, 20 insertions, 33 deletions
diff --git a/TOOLS/Makefile b/TOOLS/Makefile index 1010420986..dd08ea223e 100644 --- a/TOOLS/Makefile +++ b/TOOLS/Makefile @@ -48,6 +48,26 @@ realcodecs: CFLAGS += -g %.so.6.0: %.o ld -shared -o $@ $< -ldl -lc +# FIXME: netstream linking is a mess that should be fixed properly some day. +# It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. +NETSTREAM_DEPS = ../libmpdemux/libmpdemux.a \ + ../stream/stream.a \ + ../dvdread/libdvdread.a \ + ../libdvdcss/libdvdcss.a \ + ../libavutil/libavutil.a \ + ../m_option.o \ + ../m_struct.o \ + ../mp_msg.o \ + ../osdep/libosdep.a \ + -ltermcap -lm \ + +ifeq ($(TARGET_WIN32),yes) +NETSTREAM_DEPS += -lwsock32 +endif + +netstream: $(NETSTREAM_DEPS) + $(CC) -o $@ netstream.o $^ + clean distclean: rm -f $(OBJS) rm -f fastmem-* fastmem2-* fastmemcpybench diff --git a/TOOLS/netstream/netstream.c b/TOOLS/netstream.c index ba2895daad..ba2895daad 100644 --- a/TOOLS/netstream/netstream.c +++ b/TOOLS/netstream.c diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile deleted file mode 100644 index 57f06a06af..0000000000 --- a/TOOLS/netstream/Makefile +++ /dev/null @@ -1,33 +0,0 @@ - -MPROOT=../.. - -include $(MPROOT)/config.mak - -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, libavformat, cdparanoia enabled -DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \ - $(MPROOT)/stream/stream.a \ - $(MPROOT)/dvdread/libdvdread.a \ - $(MPROOT)/libdvdcss/libdvdcss.a \ - $(MPROOT)/libavutil/libavutil.a \ - $(MPROOT)/m_option.o \ - $(MPROOT)/m_struct.o \ - $(MPROOT)/mp_msg.o \ - $(MPROOT)/osdep/libosdep.a \ - -ltermcap -lm \ - -ifeq ($(TARGET_WIN32),yes) -DEPS += -lwsock32 -endif - -netstream: $(DEPS) - $(CC) -o $@ netstream.o $^ - -clean: - rm -f *.o *.a *~ - -.PHONY: all clean |