bdfe7d89e2
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.
51 lines
1.4 KiB
Python
51 lines
1.4 KiB
Python
#!/usr/bin/python
|
|
import sys
|
|
import os
|
|
|
|
Import ('env')
|
|
cflags = ''
|
|
defines = []
|
|
root_build_dir=env['BF_BUILDDIR']
|
|
|
|
source_files = ['makesdna.c']
|
|
header_files = env.Glob('../*.h')
|
|
|
|
makesdna_tool = env.Clone()
|
|
dna = env.Clone()
|
|
makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
|
|
|
|
makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
|
|
'../../makesdna'])
|
|
|
|
if env['OURPLATFORM'] == 'linuxcross':
|
|
makesdna_tool.Replace(CC='gcc')
|
|
makesdna_tool.Replace(AR='ar')
|
|
makesdna_tool.Replace(LINK='gcc')
|
|
|
|
if sys.platform != 'cygwin':
|
|
makesdna_tool.Append (CCFLAGS = cflags)
|
|
makesdna_tool.Append (CPPDEFINES = defines)
|
|
targetdir = root_build_dir+'/lib'
|
|
if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
|
|
targetdir = '#'+targetdir
|
|
makesdna_tool.Append (LIBPATH = targetdir)
|
|
if env['BF_PROFILE']:
|
|
makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])
|
|
|
|
targetdir = root_build_dir + '/makesdna'
|
|
|
|
if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
|
|
targetdir = '#' + targetdir
|
|
|
|
makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_guardedalloc'])
|
|
|
|
dna_dict = dna.Dictionary()
|
|
dna.Depends ('dna.c', makesdna)
|
|
dna.Depends ('dna.c', header_files)
|
|
if env['OURPLATFORM'] != 'linuxcross':
|
|
dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET")
|
|
else:
|
|
dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET")
|
|
obj = ['intern/dna.c', 'intern/dna_genfile.c']
|
|
Return ('obj')
|