diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-14 20:32:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-14 20:32:24 +0300 |
| commit | ec00764dd2349f723ba22b45515ec34ee81edcc3 (patch) | |
| tree | cf506e71af7172ec63b89aa3d284fab27a2085e6 /tools/Blender.py | |
| parent | 131fa2e00c35ff78042a4f793891eaeb880d715c (diff) | |
| parent | 8449f0d77640c466acbda7d6ceeb71bc48317b44 (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD
Diffstat (limited to 'tools/Blender.py')
| -rw-r--r-- | tools/Blender.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 240534d4437..c52bbaa0613 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -190,7 +190,7 @@ def setup_syslibs(lenv): if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'): syslibs += Split(lenv['BF_PTHREADS_LIB']) - syslibs += Split(lenv['LLIBS']) + syslibs += lenv['LLIBS'] return syslibs @@ -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') |