diff options
author | Michel Selten <michel@mselten.demon.nl> | 2004-01-05 00:42:01 +0300 |
---|---|---|
committer | Michel Selten <michel@mselten.demon.nl> | 2004-01-05 00:42:01 +0300 |
commit | 29d23bf86438629a0fc72313d29c40e62cd1bb7d (patch) | |
tree | 0fc851d1d7c03ac5607af20297abd277634c8865 /source/blender/makesdna/intern/SConscript | |
parent | dbce416607f18c21f4dbc7f6e7d06ef1269c488b (diff) |
Forgot to add some lines and cleanup in the makesdna/intern/SConscript file.
The makesdna tool is SDL 'aware', but I forgot to pass some crucial flags to
the build command.
While working in that file, did some cleanup to make it more consistent with
the other SConscript files.
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 7a362ac2b2b..e76acf4fc65 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -1,6 +1,8 @@ import sys # Import the C flags set in the SConstruct file Import ('cflags') +Import ('cxxflags') +Import ('defines') Import ('platform_libs') Import ('platform_libpath') Import ('platform_linkflags') @@ -21,19 +23,20 @@ if sys.platform=='win32': # TODO: make sure the makesdna program does not get installed on the system. source_files = ['makesdna.c'] -include_paths = ['#/intern/guardedalloc', - '..'] - makesdna_tool = Environment (CCFLAGS='-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') -makesdna_tool.Append (CCFLAGS=cflags) -makesdna_tool.Append (LIBS=platform_libs) -makesdna_tool.Append (LIBPATH=platform_libpath) -makesdna_tool.Append (LINKFLAGS=platform_linkflags) -makesdna_tool.Append (CPPPATH=include_paths) -makesdna_tool.Append (LIBPATH='#/lib') -makesdna_tool.Append (LIBS='blender_guardedalloc') -makesdna_tool.Program (target='makesdna', source=source_files) +makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', + '..']) + +makesdna_tool.Append (CCFLAGS = cflags) +makesdna_tool.Append (CXXFLAGS = cxxflags) +makesdna_tool.Append (CPPDEFINES = defines) +makesdna_tool.Append (LIBS = platform_libs) +makesdna_tool.Append (LIBPATH = platform_libpath) +makesdna_tool.Append (LINKFLAGS = platform_linkflags) +makesdna_tool.Append (LIBPATH = '#/lib') +makesdna_tool.Append (LIBS = 'blender_guardedalloc') +makesdna_tool.Program (target = 'makesdna', source = source_files) dna = Environment () dna_dict = dna.Dictionary() |