blender-archive/source/blender/editors/space_buttons/SConscript

#!/usr/bin/python
Import ('env')

sources = env.Glob('*.c')

incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
<<<<<<< .working
incs += ' ../../makesrna ../../render/extern/include ../../bmesh'
=======
incs += ' ../../makesrna ../../render/extern/include ../../blenloader'
>>>>>>> .merge-right.r35190

defs = []

env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), defs, libtype=['core'], priority=[120] )
2.5 Added basics for oour precious Buttons Window. The one that will be (OH NO!) vertical one day? ;) 2008-12-13 19:00:54 +00:00			`#!/usr/bin/python`
			`Import ('env')`

			`sources = env.Glob('*.c')`

			`incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'`
			`incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`<<<<<<< .working`
merge with 2.5 at r21568 2009-07-16 06:27:37 +00:00			`incs += ' ../../makesrna ../../render/extern/include ../../bmesh'`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`=======`
I swear, it was just an innocence change in guardedalloc! The butterfly wing flap, causing a nice storm in the rest of blender. Now all dependencies should point ok again. CMakers, do double-test. 2011-02-21 12:35:04 +00:00			`incs += ' ../../makesrna ../../render/extern/include ../../blenloader'`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`>>>>>>> .merge-right.r35190`
2.5 Added basics for oour precious Buttons Window. The one that will be (OH NO!) vertical one day? ;) 2008-12-13 19:00:54 +00:00
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317 Notes: * Sequence transform strip uses G.scene global, this is commented out now, should be fixed. * Etch-a-ton code was most difficult to merge. The files already in 2.5 got merged, but no new files were added. Calls to these files are commented out with "XXX etch-a-ton". editarmature.c and transform_snap.c were complex to merge. Martin, please check? * Game engine compiles and links again here for scons/make/cmake (player still fails to link). 2009-03-17 21:44:58 +00:00			`defs = []`

			`env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), defs, libtype=['core'], priority=[120] )`