From 3e2766bc2ee7523ea68caedc5b11e9498ddcbbc1 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Mon, 9 Nov 2009 20:08:19 +0000
Subject: Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.
 And handful of whitespace clean ups.

---
 source/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source/Makefile')

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
-- 
cgit v1.2.3