diff options
| author | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-06-06 14:48:57 +0900 |
|---|---|---|
| committer | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-06-06 14:55:51 +0900 |
| commit | b04aa714afad014f2cdecc3ded9df0586f685921 (patch) | |
| tree | 698147d84e011498e1a67c38eadc08b39bfac96c /SConstruct | |
| parent | f27c7729a98937a761eacceabdfd03f9d694d257 (diff) | |
scons: Put the tool logic in a frontend tool.
More logic can be shared between public and private branches this way.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/SConstruct b/SConstruct index 8c8a82b38ec..4fddcc531ea 100644 --- a/SConstruct +++ b/SConstruct @@ -53,8 +53,12 @@ opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys, env = Environment( MSVS_VERSION = '7.1', - options = opts, - ENV = os.environ) + options = opts, + tools = ['gallium'], + toolpath = ['scons'], + ENV = os.environ, +) + Help(opts.GenerateHelpText(env)) # replicate options values in local variables @@ -82,25 +86,6 @@ Export([ ####################################################################### # Environment setup -# -# TODO: put the compiler specific settings in separate files -# TODO: auto-detect as much as possible - -if platform == 'winddk': - env.Tool('winddk', ['scons']) - - env.Append(CPPPATH = [ - env['SDK_INC_PATH'], - env['DDK_INC_PATH'], - env['WDM_INC_PATH'], - env['CRT_INC_PATH'], - ]) - -if platform == 'wince': - env.Tool('evc', ['scons']) - -common.generate(env) - # Includes env.Append(CPPPATH = [ @@ -111,13 +96,6 @@ env.Append(CPPPATH = [ ]) -# x86 assembly -if x86: - if gcc: - env.Append(CFLAGS = '-m32') - env.Append(CXXFLAGS = '-m32') - - # Posix if platform in ('posix', 'linux', 'freebsd', 'darwin'): env.Append(CPPDEFINES = [ @@ -182,6 +160,6 @@ Export('env') SConscript( 'src/SConscript', - build_dir = common.make_build_dir(env), + build_dir = env['build'], duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html ) |