projects
/
blender.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
== FFMPEG ==
[blender.git]
/
extern
/
Makefile
diff --git
a/extern/Makefile
b/extern/Makefile
index 6218f974aff3a6ede4d5dce00bdbf310ad1f6610..29a39ed55e80b9c9a0e5173576cdf9aea67913f0 100644
(file)
--- a/
extern/Makefile
+++ b/
extern/Makefile
@@
-40,6
+40,12
@@
ifeq ($(WITH_FREETYPE2), true)
DIRS += bFTGL/src
endif
+ifeq ($(WITH_FFMPEG), true)
+ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
+ DIRS += ffmpeg
+endif
+endif
+
ifneq ($(NAN_NO_KETSJI), true)
DIRS += qhull/src solid bullet
endif