From 4b40d73bfbd5ff67db727746b992a66c910a9cac Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Aug 2010 04:30:47 +0000 Subject: rename most scons build targets to match cmake --- source/blender/makesdna/intern/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesdna/intern/SConscript') diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 116a9c40973..78f5fcaba69 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -50,7 +50,7 @@ targetdir = normpath(root_build_dir + '/makesdna') 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', 'bf_blenlib']) +makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_blenlib']) dna_dict = dna.Dictionary() dna.Depends ('dna.c', makesdna) -- cgit v1.2.3 From 6c113b54b3566966b5ab2b731a59fa39b79aacd2 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sun, 29 Aug 2010 20:52:05 +0000 Subject: Finally change SConscript tabs to spaces. --- source/blender/makesdna/intern/SConscript | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'source/blender/makesdna/intern/SConscript') diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 78f5fcaba69..d4836631104 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -3,7 +3,7 @@ import sys import os def normpath(path): - return os.path.abspath(os.path.normpath(path)) + return os.path.abspath(os.path.normpath(path)) Import ('env') cflags = '' @@ -18,21 +18,21 @@ dna = env.Clone() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', - '../../makesdna']) + '../../makesdna']) if env['OURPLATFORM'] == 'linuxcross': - USE_WINE = True # when cross compiling on linux 64bit this is useful + USE_WINE = True # when cross compiling on linux 64bit this is useful else: - USE_WINE = False + USE_WINE = False if not USE_WINE: - if env['OURPLATFORM'] == 'linuxcross': - makesdna_tool.Replace(CC='gcc') - makesdna_tool.Replace(AR='ar') - makesdna_tool.Replace(LINK='gcc') + if env['OURPLATFORM'] == 'linuxcross': + makesdna_tool.Replace(CC='gcc') + makesdna_tool.Replace(AR='ar') + makesdna_tool.Replace(LINK='gcc') if sys.platform != 'cygwin': - makesdna_tool.Append (CCFLAGS = cflags) + makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append( CFLAGS = env['CFLAGS']) makesdna_tool.Append( CCFLAGS = env['CCFLAGS']) @@ -40,15 +40,15 @@ makesdna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS']) targetdir = normpath(root_build_dir+'/lib') if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): - targetdir = '#'+targetdir + targetdir = '#'+targetdir makesdna_tool.Append (LIBPATH = targetdir) if env['BF_PROFILE']: - makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_LINKFLAGS']) + makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_LINKFLAGS']) targetdir = normpath(root_build_dir + '/makesdna') if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): - targetdir = '#' + targetdir + targetdir = '#' + targetdir makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_blenlib']) @@ -57,15 +57,15 @@ dna.Depends ('dna.c', makesdna) dna.Depends ('dna.c', header_files) if env['OURPLATFORM'] != 'linuxcross': - if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): - dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") - else: - dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): + dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") + else: + dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") else: - if USE_WINE: - dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET") - else: - dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET") + if USE_WINE: + dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET") + else: + dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET") obj = ['intern/dna.c', 'intern/dna_genfile.c'] Return ('obj') -- cgit v1.2.3 From 322ff7dfe42a77da4caf63fcaa98a82ef6e6ecad Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 21 Feb 2011 12:35:04 +0000 Subject: I swear, it was just an innocence change in guardedalloc! The butterfly wing flap, causing a nice storm in the rest of blender. Now all dependencies should point ok again. CMakers, do double-test. --- source/blender/makesdna/intern/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesdna/intern/SConscript') diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index d4836631104..e51ee53e078 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -18,7 +18,7 @@ dna = env.Clone() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', - '../../makesdna']) + '../../makesdna', '../../blenloader']) if env['OURPLATFORM'] == 'linuxcross': USE_WINE = True # when cross compiling on linux 64bit this is useful -- cgit v1.2.3