Revision cc654dd7

View differences:

Makefile
59 59

  
60 60
OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
61 61
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
62
FFLIBDIRS = -L./libavformat -L./libavcodec -L./libavutil
62
LDFLAGS += -L./libavformat -L./libavcodec -L./libavutil
63 63
FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
64 64

  
65 65
ifeq ($(CONFIG_SWSCALER),yes)
66
FFLIBDIRS+=-L./libswscale
66
LDFLAGS+=-L./libswscale
67 67
FFLIBS+=-lswscale$(BUILDSUF)
68 68
endif
69 69

  
......
81 81
endif
82 82

  
83 83
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
84
	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
84
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
85 85

  
86 86
ffserver$(EXESUF): ffserver.o .libs
87
	$(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
87
	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
88 88

  
89 89
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
90
	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
90
	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
91 91

  
92 92
%$(EXESUF): %_g$(EXESUF)
93 93
	cp -p $< $@
......
98 98
	$(SRC_PATH)/version.sh "$(SRC_PATH)"
99 99

  
100 100
output_example$(EXESUF): output_example.o .libs
101
	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
101
	$(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
102 102

  
103 103
qt-faststart$(EXESUF): qt-faststart.c
104 104
	$(CC) $(CFLAGS) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)

Also available in: Unified diff