diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2009-09-18 19:56:49 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2009-09-18 19:56:49 +0000 |
| commit | ced92d85445353f42c6922b5ce3f8fa777bbcb19 (patch) | |
| tree | 47be15ca316c67056b065371e19ff3f1baf6b9fb /SConstruct | |
| parent | 2bd989d4c83f94b2381e2ec6b94d80753a3c271f (diff) | |
Fix compiling in Snow Leopard, the Update stuff in the Video plugin shouldn't be in the GUI since it breaks nowx builds, wasn't sure where to put it, but Render.cpp seemed like the best place. Fixed wiiuse.c, and the SConscripts needed updating for Snow Leopard. Building 32bit in Snow Leopard is apparently broken. and Running 64bit in Snow Leopard seems to fail. Haven't tracked this down yet
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4299 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index f7a0297cfe..e264744559 100644 --- a/SConstruct +++ b/SConstruct @@ -106,6 +106,7 @@ vars.AddVariables( BoolVariable('bundle', 'Set to create bundle', False), BoolVariable('lint', 'Set for lint build (extra warnings)', False), BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False), + BoolVariable('noal', 'Build without OpenAL', False), BoolVariable('wxgl', 'Set For Building with WX GL libs (WIP)', False), BoolVariable('jittest', 'temp don\'t use (WIP)', False), BoolVariable('nojit', 'Remove entire jit cores', False), @@ -243,7 +244,10 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez') # needed for sound env['HAVE_AO'] = conf.CheckPKG('ao') -env['HAVE_OPENAL'] = conf.CheckPKG('openal') +if env['noal']: + env['HAVE_OPENAL'] = 0 +else: + env['HAVE_OPENAL'] = conf.CheckPKG('openal') env['HAVE_ALSA'] = conf.CheckPKG('alsa') @@ -262,9 +266,10 @@ if conf.CheckPKG('sfml-network') and conf.CheckCXXHeader("SFML/Network/Ftp.hpp") if sys.platform == 'darwin': if env['osx'] == '64cocoa': env['nowx'] = True - compileFlags += ['-arch' , 'x86_64' ] + compileFlags += ['-arch' , 'x86_64', '-m64' ] conf.Define('MAP_32BIT', 0) - + if env['osx'] == '32cocoa': + compileFlags += ['-arch' , 'i386', '-m32' ] if not env['osx'] == '32x11': env['HAVE_X11'] = 0 env['HAVE_COCOA'] = 1 |