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
path: root/extern
diff options
context:
space:
mode:
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-11-09 23:08:19 +0300
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-11-09 23:08:19 +0300
commit3e2766bc2ee7523ea68caedc5b11e9498ddcbbc1 (patch)
treebc1744ec4bf32ef339a1190ef7599d5f935b8049 /extern
parent8ab49a4c5e57f83f4855ed7aadd62b5a7736193f (diff)
Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.
And handful of whitespace clean ups.
Diffstat (limited to 'extern')
-rw-r--r--extern/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/extern/Makefile b/extern/Makefile
index a30cd1d7ca3..4a2e7a6d59b 100644
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -34,7 +34,7 @@ DIRS = glew/src
# Cloth requires it
ifeq ($(NAN_USE_BULLET), true)
- DIRS += bullet2
+ DIRS += bullet2
endif
ifeq ($(WITH_BINRELOC), true)
@@ -42,7 +42,9 @@ ifeq ($(WITH_BINRELOC), true)
endif
ifeq ($(WITH_OPENJPEG), true)
- DIRS += libopenjpeg
+ ifndef BF_OPENJPEG
+ DIRS += libopenjpeg
+ endif
endif
ifeq ($(WITH_LZO), true)