diff options
| author | Michel Selten <michel@mselten.demon.nl> | 2004-04-12 01:11:18 +0400 |
|---|---|---|
| committer | Michel Selten <michel@mselten.demon.nl> | 2004-04-12 01:11:18 +0400 |
| commit | 450fdbfd82474db1e1f6f8a9f2ab18936fd166bd (patch) | |
| tree | 1dd6e2d3e723256119962813226f4a5c470111f1 /source/blender/makesdna/intern/SConscript | |
| parent | c78184e331ff9449120808359e0b9e4bb5565677 (diff) | |
SCons updates
* Updates to the cygwin build.
the dna.c file used to be generated with a full path. Cygwin doesn't like
this. The problem was with some cflags and linkflags that are used to build
makesdna.exe
Hos nicely pointed this out and proposed a solution.
Now, these flags are only added to the command when the platform != 'cygwin'.
* Updated some variables in SConstruct.
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index ef9ddb05a32..0acc20d9fbe 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -1,4 +1,5 @@ -# Import the C flags set in the SConstruct file +import sys + Import ('cflags') Import ('defines') Import ('user_options_dict') @@ -14,9 +15,10 @@ 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) +if sys.platform != 'cygwin': + makesdna_tool.Append (CCFLAGS = cflags) + makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS']) makesdna_tool.Append (CPPDEFINES = defines) -makesdna_tool.Append (LINKFLAGS = user_options_dict['PLATFORM_LINKFLAGS']) makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib') makesdna_tool.Append (LIBS = 'blender_guardedalloc') makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files) |