piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4299 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2009-09-18 19:56:49 +00:00
parent 2bd989d4c8
commit ced92d8544
11 changed files with 89 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SConstruct
View File

@ -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