build generic modules in their own lib, compiling without the game engine would fail...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 18 Jun 2009 04:36:45 +0000 (04:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 18 Jun 2009 04:36:45 +0000 (04:36 +0000)
(scons only)

source/blender/python/SConscript
source/gameengine/Ketsji/SConscript

index 93b23a9c4cfa8688df3f9b2335340e85db258edd..c974ebe1092decd334e0f22daeb5c05522d8ac9b 100644 (file)
@@ -16,6 +16,6 @@ if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc') and env['BF_DEBUG']:
 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
index 5b6b8bba730b28d511a081af39cb846891688b75..49dbacc89160aa813572ce0b34a25cde52accccd 100644 (file)
@@ -6,28 +6,6 @@ Import ('env')
 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'