3 files changed, 23 insertions, 1 deletions
diff --git a/build_files/make/nan_compile.mk b/build_files/make/nan_compile.mk
index 36c315a8e11..4107bb1820d 100644
--- a/build_files/make/nan_compile.mk
+++ b/build_files/make/nan_compile.mk
@@ -89,7 +89,6 @@ ifeq ($(OS),darwin)
         CCFLAGS += -pipe -fPIC -funsigned-char
     endif
 
-
     CFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS)
     CCFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS)
 
@@ -177,6 +176,9 @@ ifeq ($(OS),linux)
     REL_CFLAGS  += -O2
     REL_CCFLAGS += -O2
     NAN_DEPEND = true
+  ifeq ($(WITH_BF_RAYOPTIMIZATION), true) 
+    CCFLAGS += -msse
+  endif
   ifeq ($(CPU),alpha)
     CFLAGS += -mieee
   endif
diff --git a/build_files/make/nan_definitions.mk b/build_files/make/nan_definitions.mk
index d14bdb0a13c..d8da2189e6d 100644
--- a/build_files/make/nan_definitions.mk
+++ b/build_files/make/nan_definitions.mk
@@ -159,6 +159,17 @@ ifndef CONFIG_GUESS
   endif
 
   export WITH_TIFF ?= true
+
+  #enable raytracing optimization (currently only for i386 and x86_64)
+  ifeq ($(CPU),powerpc)
+    export WITH_BF_RAYOPTIMIZATION ?= false
+  else
+    export WITH_BF_RAYOPTIMIZATION ?= true
+  endif
+
+  export WITH_LCMS ?= false
+  export WITH_CINEON ?= true
+  export WITH_HDR ?= true
   
   # Compare recreated .mo files with committed ones
   export BF_VERIFY_MO_FILES ?= true
@@ -622,6 +633,11 @@ ifndef CONFIG_GUESS
   # default tiff libs
   export NAN_TIFF_LIBS ?= $(NAN_TIFF)/lib/libtiff.a
 
+  # default path to lcms, may be overidden in platform sections above or in user-def.mk
+  export BF_LCMS ?= $(LCGDIR)/lcms
+  export BF_LCMS_INC ?= $(BF_LCMS)/include
+  export BF_LCMS_LIBS ?= $(BF_LCMS)/lib/liblcms.a
+
 endif # CONFIG_GUESS
 
 # Don't want to build the gameengine?
diff --git a/build_files/make/nan_link.mk b/build_files/make/nan_link.mk
index bbf4053b14c..43fba13f45b 100644
--- a/build_files/make/nan_link.mk
+++ b/build_files/make/nan_link.mk
@@ -195,4 +195,8 @@ ifeq ($(WITH_TIFF),true)
    LLIBS += $(NAN_TIFF_LIBS)
 endif
 
+ifeq ($(WITH_LCMS),true)
+   LLIBS += $(BF_LCMS_LIBS)
+endif
+
 LLIBS += $(NAN_PYTHON_LIB)