diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-12 00:37:53 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-12 00:37:53 +0300 |
| commit | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (patch) | |
| tree | b967fb1bbbde95113f62cd9bc93ff4b43f1d19d8 /tools | |
| parent | 418ee26c0eaad5aec48c2bb8f2d485ba3ed26343 (diff) | |
previous commits showed that the absolute path problem was even deeper. This should fix yet again some of the problems with giving them to BF_BUILDDIR
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 01e55f303d3..b192a591aa1 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -99,7 +99,10 @@ def create_blender_liblist(lenv = None, libtype = None): sortlist.sort() for sk in sortlist: v = curlib[sk] - lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) + target = root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'] + if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): + target = '#'+target + lst.append(target) return lst @@ -445,9 +448,7 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(CXXFLAGS = lenv['CXX_WARN']) targetdir = root_build_dir+'lib/' + libname - if root_build_dir[0]==os.sep or root_build_dir[1]==':': - pass - else: + if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): targetdir = '#'+targetdir lib = lenv.Library(target= targetdir, source=sources) SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build @@ -481,6 +482,8 @@ class BlenderEnvironment(SConsEnvironment): if lenv['BF_PROFILE']: lenv.Append(LINKFLAGS = lenv['BF_PROFILE_FLAGS']) lenv.Append(CPPPATH=includes) + if root_build_dir[0]==os.sep or root_build_dir[1]==':': + lenv.Append(LIBPATH=root_build_dir + '/lib') lenv.Append(LIBPATH=libpath) lenv.Append(LIBS=libs) if lenv['WITH_BF_QUICKTIME']: |