diff options
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index e30f14f69ce..2e18528aaa4 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -2,33 +2,39 @@ import sys import os -Import ('cflags') -Import ('defines') -Import ('user_options_dict') +#Import ('cflags') +#Import ('defines') +Import ('env') +cflags = '' +defines = [] +root_build_dir=env['BF_BUILDDIR'] # TODO: make sure the makesdna program does not get installed on the system. source_files = ['makesdna.c'] -makesdna_tool = Environment (ENV = os.environ, CCFLAGS='-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') +makesdna_tool = env.Copy() +dna = env.Copy() +makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') +#makesdna_tool = Environment (ENV = os.environ, CCFLAGS='-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', '../../makesdna']) -makesdna_tool.Replace (CC = user_options_dict['HOST_CC']) -makesdna_tool.Replace (PATH = user_options_dict['PATH']) +#makesdna_tool.Replace (CC = user_options_dict['HOST_CC']) +#makesdna_tool.Replace (PATH = user_options_dict['PATH']) if sys.platform != 'cygwin': - makesdna_tool.Append (CCFLAGS = cflags) - makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS']) + makesdna_tool.Append (CCFLAGS = cflags) + #makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS']) makesdna_tool.Append (CPPDEFINES = defines) -makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib') +makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') makesdna_tool.Append (LIBS = 'blender_guardedalloc') -makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files) +makesdna_tool.Program (target = '#'+root_build_dir+'makesdna', source = source_files) -dna = Environment (ENV = os.environ) +#dna = Environment (ENV = os.environ) dna_dict = dna.Dictionary() -makesdna_name = user_options_dict['BUILD_DIR']+'makesdna' + dna_dict['PROGSUFFIX'] +makesdna_name = root_build_dir+'makesdna' + dna_dict['PROGSUFFIX'] dna.Depends ('dna.c', '#'+makesdna_name) -dna.Command ('dna.c', '', user_options_dict['BUILD_DIR']+"makesdna $TARGET") +dna.Command ('dna.c', '', root_build_dir+"makesdna $TARGET") obj = 'intern/dna.c' Return ('obj') |