diff options
| author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-11-09 23:08:19 +0300 |
|---|---|---|
| committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-11-09 23:08:19 +0300 |
| commit | 3e2766bc2ee7523ea68caedc5b11e9498ddcbbc1 (patch) | |
| tree | bc1744ec4bf32ef339a1190ef7599d5f935b8049 /source/blender/imbuf | |
| parent | 8ab49a4c5e57f83f4855ed7aadd62b5a7736193f (diff) | |
Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.
And handful of whitespace clean ups.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/Makefile b/source/blender/imbuf/intern/Makefile index 427052cbdc3..0f2020c799a 100644 --- a/source/blender/imbuf/intern/Makefile +++ b/source/blender/imbuf/intern/Makefile @@ -39,7 +39,7 @@ include nan_definitions.mk DIRS = cineon ifeq ($(WITH_OPENEXR), true) - DIRS += openexr + DIRS += openexr CFLAGS += -DWITH_OPENEXR endif @@ -49,7 +49,11 @@ ifeq ($(WITH_DDS), true) endif ifeq ($(WITH_OPENJPEG), true) - CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg + ifndef BF_OPENJPEG_INC + CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg + else + CFLAGS += -DWITH_OPENJPEG -I$(BF_OPENJPEG_INC) + endif endif CFLAGS += $(LEVEL_1_C_WARNINGS) |