diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-03-30 14:03:03 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-03-30 14:03:03 +0400 |
| commit | 084aa7aedb33dbd86a98ac1e089933851ba2954b (patch) | |
| tree | 435d06aee4a19b5cc73f1544a2c34a1d9cd98671 /source/blender/makesdna/intern/SConscript | |
| parent | a083d7c5b5d8b04588e6ae8fd0c40254df536a43 (diff) | |
| parent | 89b906db9f758fb9642e01d9b4433b97557369fb (diff) | |
merge with 2.5 at r19462
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 6c8f48da251..eae75a1658b 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -2,10 +2,13 @@ import sys import os +def normpath(path): + return os.path.abspath(os.path.normpath(path)) + Import ('env') cflags = '' defines = [] -root_build_dir=env['BF_BUILDDIR'] +root_build_dir=normpath(env['BF_BUILDDIR']) source_files = ['makesdna.c'] header_files = env.Glob('../*.h') @@ -31,14 +34,15 @@ if not USE_WINE: if sys.platform != 'cygwin': makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CPPDEFINES = defines) -targetdir = root_build_dir+'/lib' +targetdir = normpath(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_LINKFLAGS']) -targetdir = root_build_dir + '/makesdna' +targetdir = normpath(root_build_dir + '/makesdna') if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): targetdir = '#' + targetdir |