svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / Ketsji / SConscript
index 921aba9c11fb11efb959f37dbe5517d879465f0a..b09267b79ff67359979a688769c1bdb76f58cfa3 100644 (file)
@@ -6,29 +6,7 @@ Import ('env')
 sources = env.Glob('*.cpp')
 defs = ''
 
-# XXX 2.5
-# Mathutils C files.
-#sources.extend([\
-#      '#source/blender/python/api2_2x/Mathutils.c',\
-#      '#source/blender/python/api2_2x/constant.c',\
-#      '#source/blender/python/api2_2x/euler.c',\
-#      '#source/blender/python/api2_2x/gen_utils.c',\
-#      '#source/blender/python/api2_2x/matrix.c',\
-#      '#source/blender/python/api2_2x/point.c',\
-#      '#source/blender/python/api2_2x/quat.c',\
-#      '#source/blender/python/api2_2x/vector.c',\
-#])
-#
-#sources.extend([\
-#      '#source/blender/python/api2_2x/bpy_internal_import.c'
-#])
-#
-#
-#sources.extend([\
-#      '#source/blender/python/api2_2x/BGL.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'
@@ -40,16 +18,9 @@ incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/inc
 incs += ' #source/blender/makesdna #source/blender/python #source/gameengine/Rasterizer'
 incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network'
 incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common #source/gameengine/Physics/Bullet'
-incs += ' #source/gameengine/Physics/BlOde #source/gameengine/Physics/Dummy'
+incs += ' #source/gameengine/Physics/Dummy'
 incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu'
 
-if env['WITH_BF_SOLID']:
-       incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/include'
-       incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
-       incs += ' ' + env['BF_SOLID_INC']
-       defs += ' USE_SUMO_SOLID'
-
-
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']