scons build dir was assumed to be relative, this isn't always the case. also, define...
authorJoseph Eagar <joeedh@gmail.com>
Sun, 30 Nov 2008 13:25:59 +0000 (13:25 +0000)
committerJoseph Eagar <joeedh@gmail.com>
Sun, 30 Nov 2008 13:25:59 +0000 (13:25 +0000)
config/win32-mingw-config.py
source/blender/makesrna/intern/SConscript

index 22666851f289f552490f78c9f5d504f60425506c..6483b215182c4fbff8317c610a127b8d93d77324 100644 (file)
@@ -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'
index f8d623dfa2bcc709ca7f7bec8142b2d46ea06529..935473abe0a6dff2107075f74030e513bc88aa90 100644 (file)
@@ -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)