2007-12-27 22:16:54 +00:00
|
|
|
#!/usr/bin/python
|
|
|
|
|
Import ('env')
|
|
|
|
|
|
|
|
|
|
sources = env.Glob('intern/*.c')
|
|
|
|
|
|
|
|
|
|
#incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
|
|
|
|
|
#incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include'
|
|
|
|
|
|
|
|
|
|
incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
|
|
|
|
|
incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
|
2009-05-05 23:10:32 +00:00
|
|
|
incs += ' ../radiosity/extern/include ../../kernel/gen_system'
|
2009-01-29 05:19:27 +00:00
|
|
|
incs += ' ../makesrna ../gpu ../blenfont'
|
2007-12-27 22:16:54 +00:00
|
|
|
|
2009-05-05 23:10:32 +00:00
|
|
|
incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost'
|
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
2008-11-12 21:16:53 +00:00
|
|
|
incs += ' #/intern/elbeem #/extern/glew/include'
|
2008-12-27 20:22:22 +00:00
|
|
|
|
2009-11-21 20:36:03 +00:00
|
|
|
defs = [ 'GLEW_STATIC' ]
|
2008-12-27 20:22:22 +00:00
|
|
|
|
|
|
|
|
if not env['WITH_BF_PYTHON']:
|
|
|
|
|
defs.append('DISABLE_PYTHON')
|
|
|
|
|
|
Merge of the COLLADA GSoC branch into trunk.
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
|
|
|
if env['WITH_BF_COLLADA']:
|
|
|
|
|
defs.append('WITH_COLLADA')
|
|
|
|
|
|
2009-10-01 16:32:33 +00:00
|
|
|
if env['OURPLATFORM'] == 'linux2':
|
|
|
|
|
cflags='-pthread'
|
|
|
|
|
incs += ' ../../../extern/binreloc/include'
|
|
|
|
|
|
|
|
|
|
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
|
|
|
|
incs += ' ' + env['BF_PTHREADS_INC']
|
|
|
|
|
|
2009-10-30 20:20:48 +00:00
|
|
|
if env['WITH_GHOST_COCOA']:
|
|
|
|
|
sources.remove('intern/wm_apple.c')
|
|
|
|
|
|
2010-01-10 16:29:53 +00:00
|
|
|
if env['BF_BUILDINFO']:
|
|
|
|
|
defs.append('NAN_BUILDINFO')
|
|
|
|
|
|
2008-12-27 20:22:22 +00:00
|
|
|
env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defs, libtype=['core'], priority=[5] )
|