diff options
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index f636b228a63..5924dcb7eb3 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -6,7 +6,7 @@ Import ('defines') Import ('platform_libs') Import ('platform_libpath') Import ('platform_linkflags') -Import ('root_build_dir') +Import ('user_options_dict') if sys.platform=='win32': platform_linkflags = ['/SUBSYSTEM:CONSOLE', @@ -33,14 +33,14 @@ makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CXXFLAGS = cxxflags) makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (LINKFLAGS = platform_linkflags) -makesdna_tool.Append (LIBPATH = '#/lib') +makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib') makesdna_tool.Append (LIBS = 'blender_guardedalloc') -makesdna_tool.Program (target = '#'+root_build_dir+'makesdna', source = source_files) +makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files) dna = Environment () dna_dict = dna.Dictionary() -makesdna_name = root_build_dir+'makesdna' + dna_dict['PROGSUFFIX'] +makesdna_name = user_options_dict['BUILD_DIR']+'makesdna' + dna_dict['PROGSUFFIX'] dna.Depends ('dna.c', '#'+makesdna_name) -dna.Command ('dna.c', '', root_build_dir+"makesdna $TARGET") +dna.Command ('dna.c', '', user_options_dict['BUILD_DIR']+"makesdna $TARGET") obj = 'intern/dna.c' Return ('obj') |