previous commits showed that the absolute path problem was even deeper. This should...
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 11 Nov 2008 21:37:53 +0000 (21:37 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 11 Nov 2008 21:37:53 +0000 (21:37 +0000)
source/blender/makesdna/intern/SConscript
tools/Blender.py

index f0f0d7de8a34a0f7b15164e26d70e683c11f03ac..0a2afd66dae6510c69304abfc059df51ef251c89 100644 (file)
@@ -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'])
index 01e55f303d3fbfe86a530523c01746d48d8b5fee..b192a591aa1de702e7baab4d8055562735aab290 100644 (file)
@@ -99,7 +99,10 @@ def create_blender_liblist(lenv = None, libtype = None):
                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 @@ class BlenderEnvironment(SConsEnvironment):
                        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 @@ class BlenderEnvironment(SConsEnvironment):
                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']: