[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18101] branches/blender2.5/blender/source /blender/windowmanager: 2.5 / SCons

[Nathan Letwory]

Revision: 18101
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18101
Author:   jesterking
Date:     2008-12-27 21:22:22 +0100 (Sat, 27 Dec 2008)

Log Message:
-----------
2.5 / SCons
* make sure we can build WITH_BF_PYTHON=False

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/windowmanager/SConscript
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c

Modified: branches/blender2.5/blender/source/blender/windowmanager/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/SConscript	2008-12-27 17:43:05 UTC (rev 18100)
+++ branches/blender2.5/blender/source/blender/windowmanager/SConscript	2008-12-27 20:22:22 UTC (rev 18101)
@@ -13,4 +13,10 @@
 
 incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont'
 incs += ' #/intern/elbeem #/extern/glew/include'
-env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core'], priority=[5] )
+
+defs = []
+
+if not env['WITH_BF_PYTHON']:
+	defs.append('DISABLE_PYTHON')
+
+env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defs, libtype=['core'], priority=[5] )

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c	2008-12-27 17:43:05 UTC (rev 18100)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c	2008-12-27 20:22:22 UTC (rev 18101)
@@ -211,7 +211,9 @@
 	
 	/* before free_blender so py's gc happens while library still exists */
 	/* needed at least for a rare sigsegv that can happen in pydrivers */
+#ifndef DISABLE_PYTHON
 	BPY_end_python();
+#endif
 	
 //	fastshade_free_render();	/* shaded view */
 	free_blender();				/* blender.c, does entire library */