From 141f5f73f2243be81d520219afe91a83f9952134 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Sun, 30 Nov 2008 13:25:59 +0000 Subject: [PATCH] scons build dir was assumed to be relative, this isn't always the case. also, defined BF_PROFILE_FLAGS for win32-ming. --- config/win32-mingw-config.py | 3 ++- source/blender/makesrna/intern/SConscript | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 22666851f28..6483b215182 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -165,8 +165,9 @@ BF_DEBUG = False BF_DEBUG_CCFLAGS= ['-g'] BF_PROFILE_CCFLAGS = ['-pg','-g'] +BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS BF_PROFILE = False BF_BUILDDIR = '..\\build\\win32-mingw' BF_INSTALLDIR='..\\install\\win32-mingw' -BF_DOCDIR = '..\\install\\doc' \ No newline at end of file +BF_DOCDIR = '..\\install\\doc' 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)