[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17562] branches/blender2.5/blender/source /blender: allow building without python

[Campbell Barton]

Revision: 17562
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17562
Author:   campbellbarton
Date:     2008-11-24 22:57:58 +0100 (Mon, 24 Nov 2008)

Log Message:
-----------
allow building without python

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
    branches/blender2.5/blender/source/blender/editors/screen/SConscript
    branches/blender2.5/blender/source/blender/editors/screen/area.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c	2008-11-24 19:24:49 UTC (rev 17561)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c	2008-11-24 21:57:58 UTC (rev 17562)
@@ -37,7 +37,9 @@
 
 #include "BKE_screen.h"
 
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h"
+#endif
 
 /* keep global; this has to be accessible outside of windowmanager */
 static ListBase spacetypes= {NULL, NULL};
@@ -116,8 +118,9 @@
 	//	uiFreeBlocks(&sa->uiblocks);
 	//	uiFreePanels(&sa->panels);
 	
+#ifndef DISABLE_PYTHON
 	BPY_free_scriptlink(&sa->scriptlink);
-
+#endif
 }
 
 /* don't free screen itself */

Modified: branches/blender2.5/blender/source/blender/editors/screen/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/SConscript	2008-11-24 19:24:49 UTC (rev 17561)
+++ branches/blender2.5/blender/source/blender/editors/screen/SConscript	2008-11-24 21:57:58 UTC (rev 17562)
@@ -6,5 +6,10 @@
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../blenloader ../../windowmanager ../../python ../../makesrna'
 incs += ' #/intern/guardedalloc #/extern/glew/include'
+
+defs = ''
+
+if not env['WITH_BF_PYTHON']:
+    defs += 'DISABLE_PYTHON'
 
-env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[30, 35] )
+env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[30, 35] )

Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c	2008-11-24 19:24:49 UTC (rev 17561)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c	2008-11-24 21:57:58 UTC (rev 17562)
@@ -52,7 +52,9 @@
 
 #include "UI_resources.h"
 
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h"
+#endif
 
 #include "screen_intern.h"
 
@@ -420,11 +422,12 @@
 		ar->swinid= 0;
 	}
 		
+#ifndef DISABLE_PYTHON
 	/* scripts */
 	BPY_free_scriptlink(&sa1->scriptlink);
 	sa1->scriptlink= sa2->scriptlink;
 	BPY_copy_scriptlink(&sa1->scriptlink);	/* copies internal pointers */
-	
+#endif
 }