diff -r c005054bf4c1 -r 50a994a57849 SConstruct --- a/SConstruct Sun May 31 23:06:03 2009 +0200 +++ b/SConstruct Wed Aug 19 09:18:29 2009 +0200 @@ -276,8 +276,8 @@ sdlenv.Append(LINKFLAGS="/SUBSYSTEM:WINDOWS") else: try: - sdlenv.ParseConfig('sh sdl-config --cflags') - sdlenv.ParseConfig('sh sdl-config --libs') + sdlenv.ParseConfig('sdl-config --cflags') + sdlenv.ParseConfig('sdl-config --libs') except: pass @@ -304,11 +304,17 @@ Export('env pyenv sdlenv have_sdl cc') lib = SConscript('src/SConscript', build_dir='build/lib', duplicate=0, exports={'buildmodule':False}) -(pymodule, modvcproj) = SConscript('src/SConscript', build_dir='build/pymodule', duplicate=0, - exports={'buildmodule':True}) +if cc == 'msvc': + (pymodule, modvcproj) = SConscript('src/SConscript', build_dir='build/pymodule', duplicate=0, + exports={'buildmodule':True}) + ccdemvcproj = SConscript('ccdemos/SConscript', build_dir='build/ccdemos', duplicate=0, exports='lib') + demosvcproj = SConscript('demos/SConscript', exports='pymodule') +else: + pymodule = SConscript('src/SConscript', build_dir='build/pymodule', duplicate=0, + exports={'buildmodule':True}) + SConscript('ccdemos/SConscript', build_dir='build/ccdemos', duplicate=0, exports='lib') + SConscript('demos/SConscript', exports='pymodule') -ccdemvcproj = SConscript('ccdemos/SConscript', build_dir='build/ccdemos', duplicate=0, exports='lib') -demosvcproj = SConscript('demos/SConscript', exports='pymodule') SConscript('tests/SConscript', build_dir='build/tests', duplicate=0, exports='lib') SConscript('models/SConscript') @@ -322,10 +328,11 @@ env.Alias('pyrit', 'no-download') Default('pyrit') -vcsol = env.MSVSSolution( - target = 'pyrit' + env['MSVSSOLUTIONSUFFIX'], - projects = [modvcproj, ccdemvcproj, demosvcproj], - variant = 'Release') +if cc == 'msvc': + vcsol = env.MSVSSolution( + target = 'pyrit' + env['MSVSSOLUTIONSUFFIX'], + projects = [modvcproj, ccdemvcproj, demosvcproj], + variant = 'Release') -env.Depends(vcsol, [modvcproj, ccdemvcproj, demosvcproj]); -env.Alias('vcproj', vcsol) + env.Depends(vcsol, [modvcproj, ccdemvcproj, demosvcproj]); + env.Alias('vcproj', vcsol)