griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Forgot to add some lines and cleanup in the makesdna/intern/SConscript file.

Browse Source 
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.
This commit is contained in:
Michel Selten
2004-01-04 21:42:01 +00:00
parent dbce416607
commit 29d23bf864
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/makesdna/intern/SConscript
View File

@@ -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()