From 489db9994df0bd95ac595922b38391ee68c3088f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Jun 2009 20:33:34 +0000 Subject: Some generic modules from blender 2.4x building with py3k and mostly working. * Mathutils, Geometry, BGL, Mostly working, some //XXX comments for things to fix with py3 python import override (bpy_internal_import.c) so you can import python internal scripts from the BGE and running blender normally. --- source/gameengine/Ketsji/SConscript | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'source/gameengine/Ketsji/SConscript') diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 5ab15c9eab3..5b6b8bba730 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -6,32 +6,29 @@ Import ('env') sources = env.Glob('*.cpp') defs = '' -# XXX 2.5 # Mathutils C files. -""" -if not env['BF_PYTHON_VERSION'].startswith('3'): + +if env['BF_PYTHON_VERSION'].startswith('3'): # TODO - py3 support sources.extend([\ - '#source/blender/python/api2_2x/Mathutils.c',\ - '#source/blender/python/api2_2x/Geometry.c',\ - '#source/blender/python/api2_2x/euler.c',\ - '#source/blender/python/api2_2x/matrix.c',\ - '#source/blender/python/api2_2x/quat.c',\ - '#source/blender/python/api2_2x/vector.c',\ - '#source/blender/python/api2_2x/constant.c',\ + '#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/api2_2x/BGL.c' + '#source/blender/python/generic/BGL.c' + ]) + + sources.extend([\ + '#source/blender/python/generic/bpy_internal_import.c' ]) - -sources.extend([\ - '#source/blender/python/api2_2x/bpy_internal_import.c' -]) -""" -incs = '. #source/blender/python/api2_2x' # Only for Mathutils! and bpy_internal_import.h, be very careful +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' incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' -- cgit v1.2.3