[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17644] branches/blender2.5/blender: scons build dir was assumed to be relative, this isn't always the case.

[Joseph Eagar]

Revision: 17644
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17644
Author:   joeedh
Date:     2008-11-30 14:25:59 +0100 (Sun, 30 Nov 2008)

Log Message:
-----------
scons build dir was assumed to be relative, this isn't always the case.  also, defined BF_PROFILE_FLAGS for win32-ming.

Modified Paths:
--------------
    branches/blender2.5/blender/config/win32-mingw-config.py
    branches/blender2.5/blender/source/blender/makesrna/intern/SConscript

Modified: branches/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py	2008-11-30 12:20:20 UTC (rev 17643)
+++ branches/blender2.5/blender/config/win32-mingw-config.py	2008-11-30 13:25:59 UTC (rev 17644)
@@ -165,8 +165,9 @@
 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'

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2008-11-30 12:20:20 UTC (rev 17643)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2008-11-30 13:25:59 UTC (rev 17644)
@@ -32,14 +32,24 @@
 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)