sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

== SCons ==

Browse Source 
* makesrna and makesdna now use CFLAGS, CCFLAGS and Linking flags as specified in config.
  This might help with cross-compile on OSX 10.6 (32bit on 64bit). devroo & jensverwiebe, please test and report.
This commit is contained in:
Nathan Letwory 2009-09-05 22:39:42 +00:00
parent 08b8fc34cf
commit 75407a4ecc
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/makesdna/intern/SConscript
View File

@ -34,6 +34,9 @@ if not USE_WINE:
if sys.platform != 'cygwin': if sys.platform != 'cygwin':
makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CCFLAGS = cflags)
makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (CPPDEFINES = defines)
makesdna_tool.Append( CFLAGS = env['CFLAGS'])
makesdna_tool.Append( CCFLAGS = env['CCFLAGS'])
makesdna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
targetdir = normpath(root_build_dir+'/lib') targetdir = normpath(root_build_dir+'/lib')
if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):

6
source/blender/makesrna/intern/SConscript
View File

@ -6,7 +6,7 @@ def normpath(path):
return os.path.abspath(os.path.normpath(path)) return os.path.abspath(os.path.normpath(path))
Import ('env') Import ('env')
cflags = '-Wall' cflags = ['-Wall']
defines = [] defines = []
root_build_dir=normpath(env['BF_BUILDDIR']) root_build_dir=normpath(env['BF_BUILDDIR'])
@ -96,6 +96,10 @@ if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
makesrna_tool.Append (LIBPATH = libdir) makesrna_tool.Append (LIBPATH = libdir)
makesrna_tool.Append( CFLAGS = env['CFLAGS'])
makesrna_tool.Append( CCFLAGS = env['CCFLAGS'])
makesrna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
if env['BF_PROFILE']: if env['BF_PROFILE']:
makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS']) makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])