Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.

And handful of whitespace clean ups.

6 files changed, 40 insertions, 8 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)
diff --git a/intern/smoke/intern/Makefile b/intern/smoke/intern/Makefile
index 2cdd7d3853e..760b1627a91 100644
--- a/intern/smoke/intern/Makefile
+++ b/intern/smoke/intern/Makefile
@@ -41,6 +41,11 @@ ifeq ($(WITH_BF_OPENMP),true)
    CPPFLAGS += -DPARALLEL
 endif
 
+ifeq ($(WITH_FFTW3),true)
+    CPPFLAGS += -DFFTW3=1
+    CPPFLAGS += $(BF_FFTW3_INC)
+endif
+
 CPPFLAGS += -I.
 CPPFLAGS += -I../extern
 CPPFLAGS += -I$(NAN_PNG)/include
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
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)
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 1aff7e1dea7..50df0e777cc 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -81,8 +81,8 @@ ifndef CONFIG_GUESS
     endif
 
     export NAN_MOTO ?= $(LCGDIR)/moto
-	export NAN_ITASC ?= $(LCGDIR)/itasc
-	
+    export NAN_ITASC ?= $(LCGDIR)/itasc
+
     export BF_PROFILE ?= false
     export NAN_USE_BULLET ?= true
     export NAN_BULLET2 ?= $(LCGDIR)/bullet2
@@ -122,6 +122,7 @@ ifndef CONFIG_GUESS
     export WITH_OPENAL ?= false
     export WITH_JACK ?= false
     export WITH_SNDFILE ?= false
+    export WITH_FFTW3 ?= false
 
   ifeq ($(WITH_OPENAL), true)
     export NAN_OPENAL ?= /usr
@@ -195,7 +196,7 @@ ifndef CONFIG_GUESS
     export NAN_OPENEXR ?= $(LCGDIR)/openexr
     export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
     export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a
-    
+
     export NAN_NO_KETSJI=false
 
     ifeq ($(CPU), i386)
@@ -350,6 +351,18 @@ ifndef CONFIG_GUESS
       export NAN_OPENEXR_LIBS ?= $(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs-only-l OpenEXR | sed -s "s/-l//g" )))
     endif
 
+    ifeq ($(WITH_FFTW3), true)
+      export BF_FFTW3 ?= $(shell pkg-config --variable=prefix fftw3 )
+      export BF_FFTW3_INC ?= $(shell pkg-config --variable=includedir fftw3 )
+      export BF_FFTW3_LIBS ?= $(shell pkg-config --libs fftw3 )
+    endif
+
+    ifeq ($(WITH_OPENJPEG), true)
+      export BF_OPENJPEG ?= /usr
+      export BF_OPENJPEG_INC ?= /usr/include
+      export BF_OPENJPEG_LIBS ?= -lopenjpeg
+    endif
+
     # Uncomment the following line to use Mozilla inplace of netscape
 
     # Location of MOZILLA/Netscape header files...
diff --git a/source/nan_link.mk b/source/nan_link.mk
index 52e5c5de9ed..8f33c917526 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -170,4 +170,8 @@ ifeq ($(WITH_BF_OPENMP),true)
    LLIBS += -lgomp
 endif
 
+ifeq ($(WITH_FFTW3),true)
+    LLIBS += $(BF_FFTW3_LIBS)
+endif
+
 LLIBS += $(NAN_PYTHON_LIB)