diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-19 09:00:36 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-19 09:00:36 +0400 |
| commit | 2a89fb887e6e9cc50a30ec67fb9cb3e8b06a59cd (patch) | |
| tree | a3a35446f4b473bbe3d63df11945344f329d4803 /build_files | |
| parent | 42d4e93733f563704456fed879b5f29b042d099f (diff) | |
* Enable compile and link flags to build info also on Windows and in SCons.
* Added build_system SCons or CMake
* Write the new build info also to system-info.txt
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 1f503a5ea2d..cab245a4518 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -295,8 +295,14 @@ def buildinfo(lenv, build_type): build_rev = '-UNKNOWN-' if lenv['BF_DEBUG']: build_type = "Debug" + build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['BF_DEBUG_CCFLAGS'] + lenv['CPPFLAGS']) + build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['CPPFLAGS']) else: build_type = "Release" + build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['REL_CFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS']) + build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['REL_CXXFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS']) + + build_linkflags = ' '.join(lenv['PLATFORM_LINKFLAGS']) obj = [] if lenv['BF_BUILDINFO']: @@ -305,7 +311,12 @@ def buildinfo(lenv, build_type): 'BUILD_TYPE="%s"'%(build_type), 'BUILD_REV="%s"'%(build_rev), 'NAN_BUILDINFO', - 'BUILD_PLATFORM="%s:%s"'%(platform.system(), platform.architecture()[0])]) + 'BUILD_PLATFORM="%s:%s"'%(platform.system(), platform.architecture()[0]), + 'BUILD_CFLAGS=\\"%s\\"'%(build_cflags), + 'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags), + 'BUILD_LINKFLAGS=\\"%s\\"'%(build_linkflags), + 'BUILD_SYSTEM="SCons"' + ]) lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel']) |