[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23021] branches/blender2.5/blender/source /blender: == SCons ==

[Nathan Letwory]

Revision: 23021
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23021
Author:   jesterking
Date:     2009-09-06 00:39:42 +0200 (Sun, 06 Sep 2009)

Log Message:
-----------
== SCons ==
* 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.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
    branches/blender2.5/blender/source/blender/makesrna/intern/SConscript

Modified: branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/intern/SConscript	2009-09-05 20:12:08 UTC (rev 23020)
+++ branches/blender2.5/blender/source/blender/makesdna/intern/SConscript	2009-09-05 22:39:42 UTC (rev 23021)
@@ -34,6 +34,9 @@
 if sys.platform != 'cygwin':
 	makesdna_tool.Append (CCFLAGS = cflags)
 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')
 
 if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-09-05 20:12:08 UTC (rev 23020)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-09-05 22:39:42 UTC (rev 23021)
@@ -6,7 +6,7 @@
 	return os.path.abspath(os.path.normpath(path))
 
 Import ('env')
-cflags = '-Wall'
+cflags = ['-Wall']
 defines = []
 root_build_dir=normpath(env['BF_BUILDDIR'])
 
@@ -96,6 +96,10 @@
 
 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']:
 	makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])