diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/SConscript | 12 | ||||
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript index a73336c1aed..793d36ff602 100644 --- a/source/blender/makesdna/SConscript +++ b/source/blender/makesdna/SConscript @@ -1,13 +1,7 @@ -makesdna_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -makesdna_env.Append (CCFLAGS = cflags) -makesdna_env.Append (CXXFLAGS = cxxflags) -makesdna_env.Append (CPPDEFINES = defines) +Import ('library_env') + +makesdna_env = library_env.Copy () objs = [] diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 5924dcb7eb3..85f339bc5fa 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -1,7 +1,6 @@ import sys # Import the C flags set in the SConstruct file Import ('cflags') -Import ('cxxflags') Import ('defines') Import ('platform_libs') Import ('platform_libpath') @@ -29,8 +28,10 @@ makesdna_tool = Environment (CCFLAGS='-DBASE_HEADER="\\"source/blender/makesdna/ makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', '..']) +makesdna_tool.Replace (CC = user_options_dict['HOST_CC']) +makesdna_tool.Replace (PATH = user_options_dict['PATH']) + 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 = '#'+user_options_dict['BUILD_DIR']+'/lib') |