Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/Makefile')
-rw-r--r--extern/Makefile15
1 files changed, 3 insertions, 12 deletions
diff --git a/extern/Makefile b/extern/Makefile
index 1bebf1e1994..a30cd1d7ca3 100644
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -32,19 +32,10 @@ SOURCEDIR = extern
DIR = $(OCGDIR)/extern
DIRS = glew/src
-ifeq ($(WITH_FFMPEG), true)
-ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
- DIRS += ffmpeg
-endif
-ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
- DIRS += ffmpeg
-endif
-endif
-
# Cloth requires it
-#ifneq ($(NAN_NO_KETSJI), true)
-DIRS += bullet2
-#endif
+ifeq ($(NAN_USE_BULLET), true)
+ DIRS += bullet2
+endif
ifeq ($(WITH_BINRELOC), true)
DIRS += binreloc