diff options
-rw-r--r-- | source/blender/python/SConscript | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 22 |
2 files changed, 3 insertions, 25 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 93b23a9c4cf..c974ebe1092 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -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 diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 5b6b8bba730..49dbacc8916 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -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' |