== Makefiles ==
authorStefan Gartner <stefang@aon.at>
Wed, 4 Aug 2010 08:42:18 +0000 (08:42 +0000)
committerStefan Gartner <stefang@aon.at>
Wed, 4 Aug 2010 08:42:18 +0000 (08:42 +0000)
 * add support for LCMS (disabled by default, set WITH_LCMS to true to enable it)
 * fixed typo that prevented TIFF support to be properly enabled
 * enable ray optimization by default (scons and cmake already did this)
 * fixed building with libsndfile on darwin (disabled by default)
 * quicktime: use audaspace headers from $(NAN_AUDASPACE)/include instead of intern
 * gameengine: add -DWITH_FFMPEG to compiler flags when building with ffmpeg support

build_files/make/nan_compile.mk
build_files/make/nan_definitions.mk
build_files/make/nan_link.mk
source/Makefile
source/blender/blenkernel/intern/Makefile
source/blender/editors/space_image/Makefile
source/blender/makesrna/intern/Makefile
source/blender/quicktime/apple/Makefile
source/blender/render/intern/raytrace/Makefile
source/gameengine/Ketsji/Makefile

index 36c315a8e1124e1b1c15afd00c48afd568a2595a..be38eac4f92a50696b61c1e8c06aea30b01e7de8 100644 (file)
@@ -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)
 
index cc745828b7149d01ba3036c3012deb83b2320516..d3948511ce3f711440cefb28603f6fbea35afcab 100644 (file)
@@ -159,6 +159,11 @@ ifndef CONFIG_GUESS
   endif
 
   export WITH_TIFF ?= true
+
+  #enable raytracing optimization (currently only for i386 and x86_64)
+  export WITH_BF_RAYOPTIMIZATION ?= true
+
+  export WITH_LCMS ?= false
   export WITH_CINEON ?= true
   export WITH_HDR ?= true
   
@@ -624,6 +629,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?
index bbf4053b14c083e36a5d82b2c72824c1bb33431f..43fba13f45b693becda0a6d9909c8a1c098a68d4 100644 (file)
@@ -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)
index e0c39bff368b059b5110043c57302e4286585cb0..00ff981362cf554dc304d02b8513c8a514e1849a 100644 (file)
@@ -420,7 +420,7 @@ ifeq ($(WITH_JACK),true)
 endif
 
 ifeq ($(WITH_SNDFILE),true)
-  ifeq ($(OS),$(findstring $(OS), "linux"))
+  ifeq ($(OS),$(findstring $(OS), "linux darwin"))
     NAN_SND_LIBS += $(NAN_SNDFILELIBS)
   endif
 endif
index 7a4eb52326abb318f51abb3623b41879157a9229..eb14914c7bad032a113d03d2bf038b066ef33ced 100644 (file)
@@ -149,3 +149,8 @@ ifeq ($(OS), darwin)
       CPPFLAGS += -DPARALLEL=1
     endif
 endif
+
+ifeq ($(WITH_LCMS), true)
+    CPPFLAGS += -DWITH_LCMS
+    CPPFLAGS += -I$(BF_LCMS_INC)
+endif
index cde31085d80ff8981d338f677c7d05f8897c63f4..7267d1abb93704a50fcb92be6e14fc678318679c 100644 (file)
@@ -57,14 +57,20 @@ ifeq ($(WITH_OPENEXR), true)
     CPPFLAGS += -DWITH_OPENEXR
 endif
 
-ifeq ($(WHITH_TIFF), true)
+ifeq ($(WITH_TIFF), true)
     CPPFLAGS += -DWITH_TIFF
 endif
 
+ifeq ($(WITH_LCMS), true)
+    CPPFLAGS += -DWITH_LCMS
+    CPPFLAGS += -I$(BF_LCMS_INC)
+endif
+
 ifeq ($(WHITH_CINEON), true)
     CPPFLAGS += -DWITH_CINEON
 endif
 
 ifeq ($(WHITH_HDR), true)
     CPPFLAGS += -DWITH_HDR
-endif
\ No newline at end of file
+endif
+
index 67238045be81e52c4b14ec4d3ad96799cf7f304e..4262a3538c23bc8bc57a020e3712a12a1925ab2f 100644 (file)
@@ -97,6 +97,10 @@ ifeq ($(WITH_TIFF),true)
     CPPFLAGS += -DWITH_TIFF
 endif
 
+ifeq ($(WITH_LCMS),true)
+    CPPFLAGS += -DWITH_LCMS
+endif
+
 ifeq ($(WITH_CINEON),true)
     CPPFLAGS += -DWITH_CINEON
 endif
index 70757f02055a01fb37d7c9dd8a74e8e61e885c4a..88eea6ea002b924a06675bde83a864a82fc7033d 100644 (file)
@@ -59,5 +59,5 @@ CPPFLAGS += -I..
 CPPFLAGS += -I../../blenloader -I../../imbuf/intern -I../../imbuf 
 CPPFLAGS += -I../../blenlib -I../../makesdna -I../../editors/include -I../../avi 
 CPPFLAGS += -I../../blenkernel -I../../render/extern/include -I../../windowmanager -I../../makesrna
-CPPFLAGS += -I../../../intern/audaspace/intern
+CPPFLAGS += -I$(NAN_AUDASPACE)/include
 
index c136f945ca510c878ee875d3b840ce4357b21775..2da8038c61060fde74392be925fa459ffbe704a3 100644 (file)
@@ -63,3 +63,7 @@ endif
 ifeq ($(WITH_OPENEXR),true)
     CPPFLAGS += -DWITH_OPENEXR
 endif
+
+ifeq ($(WITH_BF_RAYOPTIMIZATION), true)
+    CPPFLAGS += -D__SSE__
+endif
index 4ecd23fc1a20da8d23916a8caf1448eea398ee3e..1a7ec4153828913def92e33f9ebae5d3eaf060e0 100644 (file)
@@ -65,6 +65,10 @@ CPPFLAGS += -I../../blender/imbuf
 CPPFLAGS += -I../../blender/gpu
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
+ifeq ($(WITH_FFMPEG), true)
+    CPPFLAGS += -DWITH_FFMPEG
+endif
+
 ###########################
 
 SOURCEDIR = source/gameengine/Ketsji