diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-05 02:55:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-05 02:55:56 +0300 |
| commit | 8ea134bd23022afbe1a06c0241c0c2c6ea2618f8 (patch) | |
| tree | 9e9fcbd8af8e82dd189beebc7bd4ed1e52b1fd87 /Makefile | |
| parent | 7de350c673e1c0ae52d655e322a072f2f6b624b0 (diff) | |
| parent | 6d14167f28b453a4410701cfeb87f7d9c18f869a (diff) | |
| download | mpv-8ea134bd23022afbe1a06c0241c0c2c6ea2618f8.tar.bz2 mpv-8ea134bd23022afbe1a06c0241c0c2c6ea2618f8.tar.xz | |
Merge svn changes up to r27202
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 31 |
1 files changed, 17 insertions, 14 deletions
@@ -434,7 +434,7 @@ SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c SRCS_COMMON-$(STREAMING_LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ - stream/stream_livedotcom.c \ + stream/stream_live555.c \ SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ @@ -773,6 +773,8 @@ version.h: osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -I. $< $@ +%(EXESUF): %.c + ###### dependency declarations / specific CFLAGS ###### @@ -888,24 +890,25 @@ codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $^ -liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) +liba52/test$(EXESUF): cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm -libvo/aspecttest$(EXESUF): libvo/aspecttest.c libvo/aspect.o libvo/geometry.o $(TEST_OBJS) +libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o osdep/mmap_anon.o cpudetect.o $(TEST_OBJS) loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g -loader/qtx/list$(EXESUF): loader/qtx/list.c $(LOADER_TEST_OBJS) -loader/qtx/qtxload$(EXESUF): loader/qtx/qtxload.c $(LOADER_TEST_OBJS) +loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) -mp3lib/test$(EXESUF): mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) -mp3lib/test2$(EXESUF): mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) +mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS) TESTS = codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ - loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) +ifdef ARCH_X86 +TESTS += loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) +endif + tests: $(TESTS) testsclean: @@ -936,20 +939,20 @@ alltools: $(ALLTOOLS) toolsclean: rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 -TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image +TOOLS/bmovl-test$(EXESUF): -lSDL_image -TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ +TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o \ libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \ $(TEST_OBJS) -TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 +TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32 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): +TOOLS/netstream$(EXESUF): TOOLS/netstream.c +TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c +TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS) fastmemcpybench: TOOLS/fastmemcpybench.c |