aboutsummaryrefslogtreecommitdiff
path: root/Makefile.include.in
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@xbmc.org>2011-02-01 22:53:13 +0200
committerAnssi Hannula <anssi@xbmc.org>2011-02-03 00:03:02 +0200
commite227b817a90c65ee8a42b31940689edd25ea3744 (patch)
tree6d927fb6bddea8cfacb81f78a27fb21270f64e0c /Makefile.include.in
parent831fa0985ce4b16e5a4d830f49275aa99ac75d73 (diff)
removed: internal ffmpeg from includes when external is used
Diffstat (limited to 'Makefile.include.in')
-rw-r--r--Makefile.include.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.include.in b/Makefile.include.in
index 0dba3ed970..bb5839f29c 100644
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -34,7 +34,9 @@ LDFLAGS+=@LDFLAGS@
INCLUDES+=$(sort @INCLUDES@)
INCLUDES+=-I@abs_top_srcdir@/lib
INCLUDES+=-I@abs_top_srcdir@/xbmc
-INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
+ifneq (@USE_EXTERNAL_FFMPEG@,1)
+ INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
+endif
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
DEFINES+= \
-D_LINUX \