diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-11-17 13:43:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-11-17 13:43:12 +0300 |
| commit | 3a1cfa50151f2a157b15774dd30a6f285cb4fa87 (patch) | |
| tree | 891957fe1ee8aa8bd1dc4d1b25c62c56f1cccbe0 /tools | |
| parent | 0bee65b624c7e6a1dd899f4f43cc1c2119f03c2d (diff) | |
Added BF_PROFILE_LINKFLAGS, Compiling with BF_PROFILE=1 was also throwing a python error.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 2 | ||||
| -rwxr-xr-x | tools/btools.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 3b5e33eda59..97b855c630b 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -476,7 +476,7 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS']) lenv.Append(LINKFLAGS = lenv['BF_OPENGL_LINKFLAGS']) if lenv['BF_PROFILE']: - lenv.Append(LINKFLAGS = lenv['BF_PROFILE_FLAGS']) + lenv.Append(LINKFLAGS = lenv['BF_PROFILE_LINKFLAGS']) lenv.Append(CPPPATH=includes) if root_build_dir[0]==os.sep or root_build_dir[1]==':': lenv.Append(LIBPATH=root_build_dir + '/lib') diff --git a/tools/btools.py b/tools/btools.py index 66d5ecc6b9a..b86bb592970 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -54,7 +54,7 @@ def validate_arguments(args, bc): 'WITH_BF_BINRELOC', 'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS', - 'BF_PROFILE_FLAGS', 'BF_PROFILE_FLAGS', 'BF_PROFILE_CXXFLAGS', + 'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS', 'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS', 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS', 'C_WARN', 'CC_WARN', 'CXX_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', @@ -340,6 +340,7 @@ def read_opts(cfg, args): ('BF_PROFILE_CFLAGS', 'C only profiling flags', ''), ('BF_PROFILE_CCFLAGS', 'C and C++ profiling flags', ''), ('BF_PROFILE_CXXFLAGS', 'C++ only profiling flags', ''), + ('BF_PROFILE_LINKFLAGS', 'Profile linkflags', ''), (BoolVariable('BF_DEBUG', 'Add debug flags if true', False)), ('BF_DEBUG_CFLAGS', 'C only debug flags', ''), |