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 /build_files/make | |
| 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
Diffstat (limited to 'build_files/make')
| -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 |
3 files changed, 14 insertions, 1 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) |