Here are my notes on things to look out for as potential problem spots: source/blender/blenkernel/intern/displist.c: + is initfastshade(void) supposed to be empty? I had to make it empty to get the merged tree to compile. source/blender/python/api2_2x/Armature.c: + went with the version that had Armature_getLayers() source/blender/python/api2_2x/Object.c + went with the version of Object_getPose() from bf-blender. (#ifdef 0-ed the other version) source/blender/python/api2_2x/Pose.[ch] + had problems linking due to no Pose_Init() ... copied these two files straight from bf-blender. source/blender/src/drawview.c: + view3d_panel_properties() had things shifted a few things shifted a few pixels, otherwise, things were painless source/blender/src/splash.jpg.c: + went with bf-blender version (orange is dead) source/gameengine: + went with bf-blender version -- does not compile due to IMB_rect* stuff, Ton should look into this.
		
			
				
	
	
		
			82 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			82 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
#!/usr/bin/python
 | 
						|
Import ('extra_includes')
 | 
						|
Import ('user_options_dict')
 | 
						|
Import ('library_env')
 | 
						|
 | 
						|
python_env = library_env.Copy ()
 | 
						|
 | 
						|
source_files = ['BPY_interface.c',
 | 
						|
                'BPY_menus.c',
 | 
						|
                'api2_2x/Armature.c',
 | 
						|
                'api2_2x/BezTriple.c',
 | 
						|
                'api2_2x/BGL.c',
 | 
						|
                'api2_2x/Blender.c',
 | 
						|
                'api2_2x/Bone.c',
 | 
						|
                'api2_2x/Camera.c',
 | 
						|
                'api2_2x/CurNurb.c',
 | 
						|
                'api2_2x/Curve.c',
 | 
						|
                'api2_2x/Draw.c',
 | 
						|
                'api2_2x/Effect.c',
 | 
						|
                'api2_2x/Font.c',
 | 
						|
                'api2_2x/EXPP_interface.c',
 | 
						|
                'api2_2x/Ipocurve.c',
 | 
						|
                'api2_2x/Ipo.c',
 | 
						|
                'api2_2x/Key.c',
 | 
						|
                'api2_2x/Lamp.c',
 | 
						|
                'api2_2x/Lattice.c',
 | 
						|
                'api2_2x/Library.c',
 | 
						|
                'api2_2x/MTex.c',
 | 
						|
                'api2_2x/Material.c',
 | 
						|
                'api2_2x/Mathutils.c',
 | 
						|
                'api2_2x/Mesh.c',
 | 
						|
                'api2_2x/Metaball.c',
 | 
						|
                'api2_2x/NLA.c',
 | 
						|
                'api2_2x/Noise.c',
 | 
						|
                'api2_2x/NMesh.c',
 | 
						|
                'api2_2x/Object.c',
 | 
						|
                'api2_2x/Pose.c',
 | 
						|
                'api2_2x/point.c',
 | 
						|
                'api2_2x/Registry.c',
 | 
						|
                'api2_2x/Scene.c',
 | 
						|
                'api2_2x/Sound.c',
 | 
						|
                'api2_2x/Sys.c',
 | 
						|
                'api2_2x/Types.c',
 | 
						|
                'api2_2x/Window.c',
 | 
						|
                'api2_2x/World.c',
 | 
						|
                'api2_2x/Pose.c',
 | 
						|
                'api2_2x/Image.c',
 | 
						|
                'api2_2x/Text.c',
 | 
						|
                'api2_2x/Text3d.c',
 | 
						|
                'api2_2x/Texture.c',
 | 
						|
                'api2_2x/Noise.c',
 | 
						|
                'api2_2x/charRGBA.c',
 | 
						|
                'api2_2x/constant.c',
 | 
						|
                'api2_2x/euler.c',
 | 
						|
                'api2_2x/gen_utils.c',
 | 
						|
                'api2_2x/logic.c',
 | 
						|
                'api2_2x/matrix.c',
 | 
						|
                'api2_2x/quat.c',
 | 
						|
                'api2_2x/rgbTuple.c',
 | 
						|
                'api2_2x/sceneRender.c',
 | 
						|
                'api2_2x/sceneRadio.c',
 | 
						|
                'api2_2x/sceneTimeLine.c',
 | 
						|
                'api2_2x/vector.c',
 | 
						|
                'api2_2x/windowTheme.c']
 | 
						|
 | 
						|
python_env.Append (CPPPATH = ['api2_2x',
 | 
						|
                              '../blenkernel',
 | 
						|
                              '../blenlib',
 | 
						|
                              '../blenloader',
 | 
						|
                              '../render/extern/include',
 | 
						|
                              '../radiosity/extern/include',
 | 
						|
                              '../makesdna',
 | 
						|
                              '#/intern/guardedalloc',
 | 
						|
                              '#/intern/bmfont',
 | 
						|
                              '../imbuf',
 | 
						|
                              '../include'])
 | 
						|
 | 
						|
python_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
 | 
						|
python_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
 | 
						|
python_env.Append (CPPPATH = extra_includes)
 | 
						|
python_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_python', source=source_files)
 |