Mercurial > mplayer.hg

comparison Makefile @ 26963:8825552ee585

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
author diego
date Fri, 06 Jun 2008 13:28:25 +0000
parents b4a743e6d17d
children 559e8d22f614
comparison
equal deleted inserted replaced
26962:457f8904a5eb 26963:8825552ee585
896 TOOLS/avi-fix$(EXESUF) \ 896 TOOLS/avi-fix$(EXESUF) \
897 TOOLS/avisubdump$(EXESUF) \ 897 TOOLS/avisubdump$(EXESUF) \
898 TOOLS/compare$(EXESUF) \ 898 TOOLS/compare$(EXESUF) \
899 TOOLS/dump_mp4$(EXESUF) \ 899 TOOLS/dump_mp4$(EXESUF) \
900 TOOLS/movinfo$(EXESUF) \ 900 TOOLS/movinfo$(EXESUF) \
901 TOOLS/netstream$(EXESUF) \
901 TOOLS/subrip$(EXESUF) \ 902 TOOLS/subrip$(EXESUF) \
903 TOOLS/vivodump$(EXESUF) \
902 904
903 ifdef ARCH_X86 905 ifdef ARCH_X86
904 TOOLS += TOOLS/modify_reg$(EXESUF) 906 TOOLS += TOOLS/modify_reg$(EXESUF)
905 endif 907 endif
906 908
907 ALLTOOLS = $(TOOLS) \ 909 ALLTOOLS = $(TOOLS) \
908 TOOLS/bmovl-test$(EXESUF) \ 910 TOOLS/bmovl-test$(EXESUF) \
909 TOOLS/vfw2menc$(EXESUF) \ 911 TOOLS/vfw2menc$(EXESUF) \
910 TOOLS/vivodump$(EXESUF) \
911 TOOLS/netstream$(EXESUF) \
912 912
913 tools: $(TOOLS) 913 tools: $(TOOLS)
914 alltools: $(ALLTOOLS) 914 alltools: $(ALLTOOLS)
915 915
916 toolsclean: 916 toolsclean:
922 libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \ 922 libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \
923 $(TEST_OBJS) 923 $(TEST_OBJS)
924 924
925 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 925 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32
926 926
927 #FIXME: Linking is broken, help welcome. 927 mplayer-nomain.o: mplayer.c
928 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TEST_OBJS) 928 $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $<
929
930 TOOLS/netstream$(EXESUF): TOOLS/netstream.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
931 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
932 TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF):
933 $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS)
929 934
930 fastmemcpybench: TOOLS/fastmemcpybench.c 935 fastmemcpybench: TOOLS/fastmemcpybench.c
931 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX 936 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX
932 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW 937 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW
933 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 938 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
945 fastmemcpybench realcodecs: CFLAGS += -g 950 fastmemcpybench realcodecs: CFLAGS += -g
946 951
947 %.so.6.0: %.o 952 %.so.6.0: %.o
948 ld -shared -o $@ $< -ldl -lc 953 ld -shared -o $@ $< -ldl -lc
949 954
950 # FIXME: netstream linking is a mess that should be fixed properly some day.
951 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
952 NETSTREAM_DEPS = libavutil/libavutil.a \
953 m_option.o \
954 m_struct.o \
955 $(TEST_OBJS)
956
957 TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS)
958 $(CC) $(CFLAGS) -o $@ $^
959
960 955
961 956
962 ###### drivers ####### 957 ###### drivers #######
963 958
964 KERNEL_INC = /lib/modules/`uname -r`/build/include 959 KERNEL_INC = /lib/modules/`uname -r`/build/include