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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | source/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index 783b51b81de..a106e655e78 100644 --- a/source/Makefile +++ b/source/Makefile @@ -188,7 +188,11 @@ ifeq ($(WITH_OPENEXR), true) endif ifeq ($(WITH_OPENJPEG), true) - COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a + ifndef BF_OPENJPEG_LIBS + COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a + else + COMLIB += $(BF_OPENJPEG_LIBS) + endif endif COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a |