diff -r 50a994a57849 -r de3e9ea18f56 SConstruct --- a/SConstruct Wed Aug 19 09:18:29 2009 +0200 +++ b/SConstruct Mon Sep 08 20:14:24 2014 +0200 @@ -302,20 +302,20 @@ ### build targets Export('env pyenv sdlenv have_sdl cc') -lib = SConscript('src/SConscript', build_dir='build/lib', duplicate=0, +lib = SConscript('src/SConscript', variant_dir='build/lib', duplicate=0, exports={'buildmodule':False}) if cc == 'msvc': - (pymodule, modvcproj) = SConscript('src/SConscript', build_dir='build/pymodule', duplicate=0, + (pymodule, modvcproj) = SConscript('src/SConscript', variant_dir='build/pymodule', duplicate=0, exports={'buildmodule':True}) - ccdemvcproj = SConscript('ccdemos/SConscript', build_dir='build/ccdemos', duplicate=0, exports='lib') + ccdemvcproj = SConscript('ccdemos/SConscript', variant_dir='build/ccdemos', duplicate=0, exports='lib') demosvcproj = SConscript('demos/SConscript', exports='pymodule') else: - pymodule = SConscript('src/SConscript', build_dir='build/pymodule', duplicate=0, + pymodule = SConscript('src/SConscript', variant_dir='build/pymodule', duplicate=0, exports={'buildmodule':True}) - SConscript('ccdemos/SConscript', build_dir='build/ccdemos', duplicate=0, exports='lib') + SConscript('ccdemos/SConscript', variant_dir='build/ccdemos', duplicate=0, exports='lib') SConscript('demos/SConscript', exports='pymodule') -SConscript('tests/SConscript', build_dir='build/tests', duplicate=0, exports='lib') +SConscript('tests/SConscript', variant_dir='build/tests', duplicate=0, exports='lib') SConscript('models/SConscript') env.Alias('demos', ['cc-demos', 'python-demos'])