bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

- [win32] updated SConscripts to use new configuration method (config.opts).

Browse Source 
NOTE: ODE support needs still to be reviewed, so disable gameengine for now.
This commit is contained in:
Nathan Letwory 2004-02-21 19:00:31 +00:00
parent fbb830db4b
commit e579793652
9 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/avi/SConscript
View File

@ -21,5 +21,6 @@ source_files = ['intern/avi.c',
avi_env.Append (CPPPATH = ['.',
'#/intern/guardedalloc'])
avi_env.Append (CPPPATH=user_options_dict['JPEG_INCLUDE'])
avi_env.Append (CPPPATH=extra_includes)
avi_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_avi', source=source_files)

1
source/blender/deflate/SConscript
View File

@ -18,5 +18,6 @@ deflate_env.Append (CPPPATH = ['.',
'../readstreamglue',
'../inflate'])
deflate_env.Append (CPPPATH=user_options_dict['Z_INCLUDE'])
deflate_env.Append (CPPPATH=extra_includes)
deflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_deflate', source=source_files)

2
source/blender/ftfont/SConscript
View File

@ -16,7 +16,9 @@ include_paths = ['.',
ftf_env = Environment()
ftf_env.Append(CPPPATH = extra_includes)
ftf_env.Append(CPPPATH = include_paths)
ftf_env.Prepend (CPPPATH = user_options_dict['FTGL_INCLUDE'])
ftf_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE'])
ftf_env.Prepend (CPPPATH = user_options_dict['GETTEXT_INCLUDE'])
ftf_env.Append(CCFLAGS = cflags)
ftf_env.Append(CXXFLAGS = cxxflags)
ftf_env.Append(CPPDEFINES = defines)

3
source/blender/imbuf/SConscript
View File

@ -46,5 +46,8 @@ imbuf_env.Append (CPPPATH = ['.',
'../quicktime',
'../blenkernel'])
imbuf_env.Append (CPPPATH = user_options_dict['JPEG_INCLUDE'])
imbuf_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
imbuf_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
imbuf_env.Append (CPPPATH = extra_includes)
imbuf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_imbuf', source=source_files)

1
source/blender/inflate/SConscript
View File

@ -17,5 +17,6 @@ inflate_env.Append (CPPPATH = ['.',
'../../kernel/gen_messaging',
'../readstreamglue'])
inflate_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
inflate_env.Append (CPPPATH = extra_includes)
inflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_inflate', source=source_files)

1
source/blender/readstreamglue/SConscript
View File

@ -18,5 +18,6 @@ readstrgl_env.Append (CPPPATH = ['.',
'../blenloader',
'../inflate'])
readstrgl_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
readstrgl_env.Append (CPPPATH = extra_includes)
readstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_readstreamglue', source=source_files)

1
source/blender/writeblenfile/SConscript
View File

@ -19,5 +19,6 @@ wrblenfile_env.Append (CPPPATH = ['.',
'../readstreamglue',
'../readblenfile'])
wrblenfile_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
wrblenfile_env.Append (CPPPATH = extra_includes)
wrblenfile_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writeblenfile', source=source_files)

1
source/blender/writestreamglue/SConscript
View File

@ -20,6 +20,7 @@ wrstrgl_env.Append (CPPPATH = ['.',
'../deflate',
'../writeblenfile',
'../../kernel/gen_messaging'])
wrstrgl_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
wrstrgl_env.Append (CPPPATH = extra_includes)
wrstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writestreamglue', source=source_files)

3
source/gameengine/Physics/BlOde/SConscript
View File

@ -4,7 +4,6 @@ phy_ode_env = Environment()
Import ('cflags')
Import ('cxxflags')
Import ('defines')
Import ('ode_include')
Import ('user_options_dict')
phy_ode_env.Append (CCFLAGS = cflags)
phy_ode_env.Append (CXXFLAGS = cxxflags)
@ -15,7 +14,7 @@ source_files = ['OdePhysicsController.cpp',
phy_ode_env.Append (CPPPATH=['.',
'../common',
ode_include
])
phy_ode_env.Append (CPPPATH=['ODE_INCLUDE'])
phy_ode_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Ode', source=source_files)