diff options
| author | nakeee <nakeee@gmail.com> | 2008-12-13 23:19:56 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2008-12-13 23:19:56 +0000 |
| commit | bb817fbced70563a5e55ec87d8b4da7e636cf61d (patch) | |
| tree | edddce2f354025bf6ff5e24b72be97856ee9dc27 /SConstruct | |
| parent | 2c66b9d36f9bc95acd0e6e87e12f4f360c7c4d6f (diff) | |
scon fixes SDL compiles
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1525 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index 1bb9a6ad1b..c18222a317 100644 --- a/SConstruct +++ b/SConstruct @@ -96,6 +96,7 @@ vars.AddVariables( BoolVariable('lint', 'Set for lint build (extra warnings)', False), BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False), BoolVariable('wxgl', 'Set For Building with WX GL libs (WIP)', False), + BoolVariable('sdlgl', 'Set For Building with SDL GL libs (WIP)', False), EnumVariable('flavor', 'Choose a build flavor', 'release', allowed_values = ('release', 'devel', 'debug'), ignorecase = 2 @@ -190,15 +191,6 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez') # needed for sound env['HAVE_AO'] = conf.CheckPKG('ao') -# handling wx flags CCFLAGS should be created before -wxmods = ['adv', 'core', 'base'] -env['USE_WX'] = 0 -if env['wxgl']: - wxmods.append('gl') - env['USE_WX'] = 1 - -env['HAVE_WX'] = conf.CheckWXConfig('2.8', wxmods, 0) - #osx 64 specifics if sys.platform == 'darwin': if env['osx'] == '64cocoa': @@ -211,13 +203,34 @@ if sys.platform == 'darwin': else: env['HAVE_X11'] = conf.CheckPKG('x11') env['HAVE_COCOA'] = 0 - + +# handling wx flags CCFLAGS should be created before +wxmods = ['adv', 'core', 'base'] +env['USE_WX'] = 0 +if env['wxgl']: + wxmods.append('gl') + env['USE_WX'] = 1 + env['HAVE_X11'] = 0 + env['HAVE_COCOA'] = 0 + +env['HAVE_WX'] = conf.CheckWXConfig('2.8', wxmods, 0) + +# SDL backend +env['USE_SDL'] = 0 + +if env['sdlgl']: + env['USE_SDL'] = 1 + env['HAVE_X11'] = 0 + env['HAVE_COCOA'] = 0 + env['USE_WX'] = 0 + # Gui less build if env['nowx']: env['HAVE_WX'] = 0; # Creating config.h defines conf.Define('HAVE_SDL', env['HAVE_SDL']) +conf.Define('USE_SDL', env['USE_SDL']) conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ']) conf.Define('HAVE_AO', env['HAVE_AO']) conf.Define('HAVE_WX', env['HAVE_WX']) |