[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17416] trunk/blender: previous commits showed that the absolute path problem was even deeper.
Nathan Letwory
jesterking at letwory.net
Tue Nov 11 22:37:54 CET 2008
Revision: 17416
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17416
Author: jesterking
Date: 2008-11-11 22:37:53 +0100 (Tue, 11 Nov 2008)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/intern/SConscript
trunk/blender/tools/Blender.py
Modified: trunk/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/intern/SConscript 2008-11-11 20:47:45 UTC (rev 17415)
+++ trunk/blender/source/blender/makesdna/intern/SConscript 2008-11-11 21:37:53 UTC (rev 17416)
@@ -25,15 +25,16 @@
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'])
Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py 2008-11-11 20:47:45 UTC (rev 17415)
+++ trunk/blender/tools/Blender.py 2008-11-11 21:37:53 UTC (rev 17416)
@@ -99,7 +99,10 @@
sortlist.sort()
for sk in sortlist:
v = curlib[sk]
- lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+ target = root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']
+ if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+ target = '#'+target
+ lst.append(target)
return lst
@@ -445,9 +448,7 @@
lenv.Append(CXXFLAGS = lenv['CXX_WARN'])
targetdir = root_build_dir+'lib/' + libname
- 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
lib = lenv.Library(target= targetdir, source=sources)
SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build
@@ -481,6 +482,8 @@
if lenv['BF_PROFILE']:
lenv.Append(LINKFLAGS = lenv['BF_PROFILE_FLAGS'])
lenv.Append(CPPPATH=includes)
+ if root_build_dir[0]==os.sep or root_build_dir[1]==':':
+ lenv.Append(LIBPATH=root_build_dir + '/lib')
lenv.Append(LIBPATH=libpath)
lenv.Append(LIBS=libs)
if lenv['WITH_BF_QUICKTIME']:
More information about the Bf-blender-cvs
mailing list