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 /source | |
| 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 'source')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index f0f0d7de8a3..0a2afd66dae 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -25,15 +25,16 @@ if env['OURPLATFORM'] == 'linuxcross': if sys.platform != 'cygwin': makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CPPDEFINES = defines) -makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') +targetdir = root_build_dir+'/lib' +if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): + targetdir = '#'+targetdir +makesdna_tool.Append (LIBPATH = targetdir) if env['BF_PROFILE']: makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS']) targetdir = root_build_dir + '/makesdna' -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 makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_guardedalloc']) |