[Bf-blender-cvs] [d2cc65c] master: Fix for missing updates of build scripts in the commit rB05cb63ecf750.

Tamito Kajiyama noreply at git.blender.org
Wed Aug 20 07:00:42 CEST 2014


Commit: d2cc65cd1cf3eac095cf0305b80af35a27f2521b
Author: Tamito Kajiyama
Date:   Wed Aug 20 13:35:45 2014 +0900
Branches: master
https://developer.blender.org/rBd2cc65cd1cf3eac095cf0305b80af35a27f2521b

Fix for missing updates of build scripts in the commit rB05cb63ecf750.

===================================================================

M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/SConscript

===================================================================

diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 6a0208a..15f5253 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -264,6 +264,10 @@ if(WITH_BULLET)
 	add_definitions(-DWITH_BULLET)
 endif()
 
+if(WITH_FREESTYLE)
+	add_definitions(-DWITH_FREESTYLE)
+endif()
+
 # Build makesrna executable
 blender_include_dirs(
 	.
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index ff75d9a..08cbd61 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -141,6 +141,9 @@ if env['WITH_BF_COLLADA']:
 if env['WITH_BF_CYCLES']:
     defs.append('WITH_CYCLES')
 
+if env['WITH_BF_FREESTYLE']:
+    defs.append('WITH_FREESTYLE')
+
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'




More information about the Bf-blender-cvs mailing list