diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2008-11-30 16:25:59 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2008-11-30 16:25:59 +0300 |
| commit | 141f5f73f2243be81d520219afe91a83f9952134 (patch) | |
| tree | 01a254f2fea4bc6b632173c993f1fd2b7df10934 /source/blender/makesrna/intern/SConscript | |
| parent | 3c4132177f4245a81fa9a506b29ba471df5e3e54 (diff) | |
scons build dir was assumed to be relative, this isn't always the case. also, defined BF_PROFILE_FLAGS for win32-ming.
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index f8d623dfa2b..935473abe0a 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -32,14 +32,24 @@ if env['OURPLATFORM'] == 'linuxcross': if sys.platform != 'cygwin': makesrna_tool.Append (CCFLAGS = cflags) makesrna_tool.Append (CPPDEFINES = defines) -makesrna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') + +libdir = root_build_dir+'/lib' +if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): + libdir = '#' + libdir + +makesrna_tool.Append (LIBPATH = libdir) + if env['BF_PROFILE']: makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS']) +targetpath = root_build_dir+'/makesrna' +if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): + targetpath = '#' + targetpath + if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep: - makesrna = makesrna_tool.Program (target = root_build_dir+'/makesrna', source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) else: - makesrna = makesrna_tool.Program (target = '#'+root_build_dir+'/makesrna', source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) rna_dict = rna.Dictionary() rna.Depends ('rna.c', makesrna) |