[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43239] trunk/blender/source/blender: Fix scons build after last commit.

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Jan 9 18:21:52 CET 2012


Revision: 43239
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43239
Author:   blendix
Date:     2012-01-09 17:21:40 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Fix scons build after last commit.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/SConscript
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript	2012-01-09 16:58:01 UTC (rev 43238)
+++ trunk/blender/source/blender/makesrna/SConscript	2012-01-09 17:21:40 UTC (rev 43239)
@@ -8,7 +8,7 @@
 
 incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
 incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
-incs += ' ../render/extern/include'
+incs += ' ../render/extern/include #/intern/cycles/blender'
 incs += ' ../nodes'
 incs += ' #/extern/glew/include'
 
@@ -58,6 +58,9 @@
 if env['WITH_BF_OCEANSIM']:
     defs.append('WITH_OCEANSIM')
 
+if env['WITH_BF_CYCLES']:
+    defs.append('WITH_CYCLES')
+
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
     incs += ' ../../../extern/binreloc/include'

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2012-01-09 16:58:01 UTC (rev 43238)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2012-01-09 17:21:40 UTC (rev 43239)
@@ -177,11 +177,14 @@
 
 /* defined in AUD_C-API.cpp */
 extern PyObject *AUD_initPython(void);
+
+#ifdef WITH_CYCLES
 /* defined in cycles module */
 static PyObject *CCL_initPython(void)
 {
 	return (PyObject*)CCL_python_module_init();
 }
+#endif
 
 static struct _inittab bpy_internal_modules[] = {
 	{(char *)"mathutils", PyInit_mathutils},



More information about the Bf-blender-cvs mailing list