diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-04 19:54:06 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-04 19:54:06 +0400 |
| commit | 461cb87e1df40b87709a568967da6d252715b1ee (patch) | |
| tree | 3b948aadfd70631099c60543ced08ee40d98b18d /tools | |
| parent | 20f39ec7d81af22d30700b3dde28938facfb2588 (diff) | |
== SCons ==
* apply a patch from b333rt. I modified to test for relative/absolute paths before doing mods by b333rt. Fixes troubles with using absolute paths in BF_BUILDDIR
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 421a79454df..d7cbe1076e7 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -101,7 +101,10 @@ def create_blender_liblist(lenv = None, libtype = None): sortlist.sort() for sk in sortlist: v = curlib[sk] - target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) + if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): + target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) + else: + target = os.path.abspath(root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) lst.append(target) return lst @@ -465,7 +468,11 @@ class BlenderEnvironment(SConsEnvironment): print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC lenv = self.Clone() - res = lenv.RES('#'+root_build_dir+'lib/'+libname, source) + if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): + res = lenv.RES('#'+root_build_dir+'lib/'+libname, source) + else: + res = lenv.RES(root_build_dir+'lib/'+libname, source) + SConsEnvironment.Default(self, res) resources.append(res) |