diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-06 13:28:25 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-06 13:28:25 +0000 |
| commit | f9810c0dfb769caa7e67660e59727aaf6b00fdbc (patch) | |
| tree | b3bba789c738aedb04f65dc9c8859b1f0a0a644d /Makefile | |
| parent | 92f79295d22d4d8810c7c02a006c47f3ab8dd8ab (diff) | |
| download | mpv-f9810c0dfb769caa7e67660e59727aaf6b00fdbc.tar.bz2 mpv-f9810c0dfb769caa7e67660e59727aaf6b00fdbc.tar.xz | |
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26995 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 9 insertions, 14 deletions
@@ -898,7 +898,9 @@ TOOLS = TOOLS/alaw-gen$(EXESUF) \ TOOLS/compare$(EXESUF) \ TOOLS/dump_mp4$(EXESUF) \ TOOLS/movinfo$(EXESUF) \ + TOOLS/netstream$(EXESUF) \ TOOLS/subrip$(EXESUF) \ + TOOLS/vivodump$(EXESUF) \ ifdef ARCH_X86 TOOLS += TOOLS/modify_reg$(EXESUF) @@ -907,8 +909,6 @@ endif ALLTOOLS = $(TOOLS) \ TOOLS/bmovl-test$(EXESUF) \ TOOLS/vfw2menc$(EXESUF) \ - TOOLS/vivodump$(EXESUF) \ - TOOLS/netstream$(EXESUF) \ tools: $(TOOLS) alltools: $(ALLTOOLS) @@ -924,8 +924,13 @@ TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 -#FIXME: Linking is broken, help welcome. -TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TEST_OBJS) +mplayer-nomain.o: mplayer.c + $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $< + +TOOLS/netstream$(EXESUF): TOOLS/netstream.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) +TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) +TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): + $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS) fastmemcpybench: TOOLS/fastmemcpybench.c $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX @@ -947,16 +952,6 @@ fastmemcpybench 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 = libavutil/libavutil.a \ - m_option.o \ - m_struct.o \ - $(TEST_OBJS) - -TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) - $(CC) $(CFLAGS) -o $@ $^ - ###### drivers ####### |