RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 00:02:52 +00:00
Code Issues Projects Releases Wiki Activity

examples/Makefile: give priority to pkg-config flags

Browse Source 
In case CFLAGS/LDLIBS are already defined and conflicting with the
pkg-config flags, give priority to the latter since they are used to
detect compilation flags.

This should fix for example the case where there are many different
instances of a library, CFLAGS=-I/foo/include and pkg-config cflags say
-I/bar/include.
This commit is contained in:
Stefano Sabatini 2012-08-24 16:49:04 +02:00
parent 6fc892d271
commit e53becc70f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/examples/Makefile
View File

@ -8,8 +8,8 @@ FFMPEG_LIBS= libavdevice \
libavutil \ libavutil \
CFLAGS += -Wall -O2 -g CFLAGS += -Wall -O2 -g
CFLAGS += $(shell pkg-config --cflags $(FFMPEG_LIBS)) CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
LDLIBS += $(shell pkg-config --libs $(FFMPEG_LIBS)) LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
EXAMPLES= decoding_encoding \ EXAMPLES= decoding_encoding \
filtering_video \ filtering_video \