[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31029] trunk/blender: == Makefiles ==
Stefan Gartner
stefang at aon.at
Wed Aug 4 10:42:19 CEST 2010
Revision: 31029
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31029
Author: sgefant
Date: 2010-08-04 10:42:18 +0200 (Wed, 04 Aug 2010)
Log Message:
-----------
== 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
Modified Paths:
--------------
trunk/blender/build_files/make/nan_compile.mk
trunk/blender/build_files/make/nan_definitions.mk
trunk/blender/build_files/make/nan_link.mk
trunk/blender/source/Makefile
trunk/blender/source/blender/blenkernel/intern/Makefile
trunk/blender/source/blender/editors/space_image/Makefile
trunk/blender/source/blender/makesrna/intern/Makefile
trunk/blender/source/blender/quicktime/apple/Makefile
trunk/blender/source/blender/render/intern/raytrace/Makefile
trunk/blender/source/gameengine/Ketsji/Makefile
Modified: trunk/blender/build_files/make/nan_compile.mk
===================================================================
--- trunk/blender/build_files/make/nan_compile.mk 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/build_files/make/nan_compile.mk 2010-08-04 08:42:18 UTC (rev 31029)
@@ -89,7 +89,6 @@
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)
Modified: trunk/blender/build_files/make/nan_definitions.mk
===================================================================
--- trunk/blender/build_files/make/nan_definitions.mk 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/build_files/make/nan_definitions.mk 2010-08-04 08:42:18 UTC (rev 31029)
@@ -159,6 +159,11 @@
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 @@
# 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?
Modified: trunk/blender/build_files/make/nan_link.mk
===================================================================
--- trunk/blender/build_files/make/nan_link.mk 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/build_files/make/nan_link.mk 2010-08-04 08:42:18 UTC (rev 31029)
@@ -195,4 +195,8 @@
LLIBS += $(NAN_TIFF_LIBS)
endif
+ifeq ($(WITH_LCMS),true)
+ LLIBS += $(BF_LCMS_LIBS)
+endif
+
LLIBS += $(NAN_PYTHON_LIB)
Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/source/Makefile 2010-08-04 08:42:18 UTC (rev 31029)
@@ -420,7 +420,7 @@
endif
ifeq ($(WITH_SNDFILE),true)
- ifeq ($(OS),$(findstring $(OS), "linux"))
+ ifeq ($(OS),$(findstring $(OS), "linux darwin"))
NAN_SND_LIBS += $(NAN_SNDFILELIBS)
endif
endif
Modified: trunk/blender/source/blender/blenkernel/intern/Makefile
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/Makefile 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/source/blender/blenkernel/intern/Makefile 2010-08-04 08:42:18 UTC (rev 31029)
@@ -149,3 +149,8 @@
CPPFLAGS += -DPARALLEL=1
endif
endif
+
+ifeq ($(WITH_LCMS), true)
+ CPPFLAGS += -DWITH_LCMS
+ CPPFLAGS += -I$(BF_LCMS_INC)
+endif
Modified: trunk/blender/source/blender/editors/space_image/Makefile
===================================================================
--- trunk/blender/source/blender/editors/space_image/Makefile 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/source/blender/editors/space_image/Makefile 2010-08-04 08:42:18 UTC (rev 31029)
@@ -57,14 +57,20 @@
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
+
Modified: trunk/blender/source/blender/makesrna/intern/Makefile
===================================================================
--- trunk/blender/source/blender/makesrna/intern/Makefile 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/source/blender/makesrna/intern/Makefile 2010-08-04 08:42:18 UTC (rev 31029)
@@ -97,6 +97,10 @@
CPPFLAGS += -DWITH_TIFF
endif
+ifeq ($(WITH_LCMS),true)
+ CPPFLAGS += -DWITH_LCMS
+endif
+
ifeq ($(WITH_CINEON),true)
CPPFLAGS += -DWITH_CINEON
endif
Modified: trunk/blender/source/blender/quicktime/apple/Makefile
===================================================================
--- trunk/blender/source/blender/quicktime/apple/Makefile 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/source/blender/quicktime/apple/Makefile 2010-08-04 08:42:18 UTC (rev 31029)
@@ -59,5 +59,5 @@
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
Modified: trunk/blender/source/blender/render/intern/raytrace/Makefile
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/Makefile 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/source/blender/render/intern/raytrace/Makefile 2010-08-04 08:42:18 UTC (rev 31029)
@@ -63,3 +63,7 @@
ifeq ($(WITH_OPENEXR),true)
CPPFLAGS += -DWITH_OPENEXR
endif
+
+ifeq ($(WITH_BF_RAYOPTIMIZATION), true)
+ CPPFLAGS += -D__SSE__
+endif
Modified: trunk/blender/source/gameengine/Ketsji/Makefile
===================================================================
--- trunk/blender/source/gameengine/Ketsji/Makefile 2010-08-04 04:01:27 UTC (rev 31028)
+++ trunk/blender/source/gameengine/Ketsji/Makefile 2010-08-04 08:42:18 UTC (rev 31029)
@@ -65,6 +65,10 @@
CPPFLAGS += -I../../blender/gpu
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+ifeq ($(WITH_FFMPEG), true)
+ CPPFLAGS += -DWITH_FFMPEG
+endif
+
###########################
SOURCEDIR = source/gameengine/Ketsji
More information about the Bf-blender-cvs
mailing list