[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20966] branches/blender2.5/blender/source : build generic modules in their own lib, compiling without the game engine would fail because bpy_internal_import. c wasnt being included.

Campbell Barton ideasman42 at gmail.com
Thu Jun 18 06:36:45 CEST 2009


Revision: 20966
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20966
Author:   campbellbarton
Date:     2009-06-18 06:36:45 +0200 (Thu, 18 Jun 2009)

Log Message:
-----------
build generic modules in their own lib, compiling without the game engine would fail because bpy_internal_import.c wasnt being included.
(scons only)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/python/SConscript
    branches/blender2.5/blender/source/gameengine/Ketsji/SConscript

Modified: branches/blender2.5/blender/source/blender/python/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/python/SConscript	2009-06-18 03:04:27 UTC (rev 20965)
+++ branches/blender2.5/blender/source/blender/python/SConscript	2009-06-18 04:36:45 UTC (rev 20966)
@@ -16,6 +16,6 @@
 env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
 
 
-# generic  XXX todo, BGE currently uses these externally
-# sources = env.Glob('generic/*.c')
-# env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
+# generic
+sources = env.Glob('generic/*.c')
+env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) # ketsji is 360

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/SConscript	2009-06-18 03:04:27 UTC (rev 20965)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/SConscript	2009-06-18 04:36:45 UTC (rev 20966)
@@ -6,28 +6,6 @@
 sources = env.Glob('*.cpp')
 defs = ''
 
-# Mathutils C files.
-
-if env['BF_PYTHON_VERSION'].startswith('3'):
-	# TODO - py3 support
-	sources.extend([\
-		'#source/blender/python/generic/Mathutils.c',\
-		'#source/blender/python/generic/Geometry.c',\
-		'#source/blender/python/generic/euler.c',\
-		'#source/blender/python/generic/matrix.c',\
-		'#source/blender/python/generic/quat.c',\
-		'#source/blender/python/generic/vector.c',\
-	])
-	
-	sources.extend([\
-		'#source/blender/python/generic/BGL.c'
-	])
-	
-	sources.extend([\
-		'#source/blender/python/generic/bpy_internal_import.c'
-	])
-
-
 incs = '. #source/blender/python/generic' # Only for Mathutils! and bpy_internal_import.h, be very careful
 
 incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc'





More information about the Bf-blender-cvs mailing list