diff options
author | Stefan Gartner <stefang@aon.at> | 2010-08-04 12:42:18 +0400 |
---|---|---|
committer | Stefan Gartner <stefang@aon.at> | 2010-08-04 12:42:18 +0400 |
commit | d50cc7826fe50e1e29a2501d2b70c75360a0534e (patch) | |
tree | 250abd6e693da3233f6c4bbdadc36d3fe86d5418 | |
parent | 708ef646631af236f6a12faa0682f7ad3913d5e0 (diff) |
== Makefiles ==
* 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
-rw-r--r-- | build_files/make/nan_compile.mk | 1 | ||||
-rw-r--r-- | build_files/make/nan_definitions.mk | 10 | ||||
-rw-r--r-- | build_files/make/nan_link.mk | 4 | ||||
-rw-r--r-- | source/Makefile | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/Makefile | 5 | ||||
-rw-r--r-- | source/blender/editors/space_image/Makefile | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/Makefile | 4 | ||||
-rw-r--r-- | source/blender/quicktime/apple/Makefile | 2 | ||||
-rw-r--r-- | source/blender/render/intern/raytrace/Makefile | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/Makefile | 4 |
10 files changed, 41 insertions, 5 deletions
diff --git a/build_files/make/nan_compile.mk b/build_files/make/nan_compile.mk index 36c315a8e11..be38eac4f92 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) diff --git a/build_files/make/nan_definitions.mk b/build_files/make/nan_definitions.mk index cc745828b71..d3948511ce3 100644 --- a/build_files/make/nan_definitions.mk +++ b/build_files/make/nan_definitions.mk @@ -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? 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) diff --git a/source/Makefile b/source/Makefile index e0c39bff368..00ff981362c 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 7a4eb52326a..eb14914c7ba 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -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 diff --git a/source/blender/editors/space_image/Makefile b/source/blender/editors/space_image/Makefile index cde31085d80..7267d1abb93 100644 --- a/source/blender/editors/space_image/Makefile +++ b/source/blender/editors/space_image/Makefile @@ -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 + diff --git a/source/blender/makesrna/intern/Makefile b/source/blender/makesrna/intern/Makefile index 67238045be8..4262a3538c2 100644 --- a/source/blender/makesrna/intern/Makefile +++ b/source/blender/makesrna/intern/Makefile @@ -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 diff --git a/source/blender/quicktime/apple/Makefile b/source/blender/quicktime/apple/Makefile index 70757f02055..88eea6ea002 100644 --- a/source/blender/quicktime/apple/Makefile +++ b/source/blender/quicktime/apple/Makefile @@ -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 diff --git a/source/blender/render/intern/raytrace/Makefile b/source/blender/render/intern/raytrace/Makefile index c136f945ca5..2da8038c610 100644 --- a/source/blender/render/intern/raytrace/Makefile +++ b/source/blender/render/intern/raytrace/Makefile @@ -63,3 +63,7 @@ endif ifeq ($(WITH_OPENEXR),true) CPPFLAGS += -DWITH_OPENEXR endif + +ifeq ($(WITH_BF_RAYOPTIMIZATION), true) + CPPFLAGS += -D__SSE__ +endif diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index 4ecd23fc1a2..1a7ec415382 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -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 |