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

define mess and some other small fixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1493 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-10 23:23:05 +00:00
parent c26c92cffd
commit 32a7c530e6
7 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SConstruct
View File

@ -99,8 +99,8 @@ vars.AddVariables(
allowed_values = ('release', 'devel', 'debug'),
ignorecase = 2
),
EnumVariable('osx', 'Choose a backend (WIP)', '32coca',
allowed_values = ('32x11', '32coca', '64coca'),
EnumVariable('osx', 'Choose a backend (WIP)', '32cocoa',
allowed_values = ('32x11', '32cocoa', '64cocoa'),
ignorecase = 2
),
PathVariable('wxconfig', 'Path to the wxconfig', None),
@ -192,9 +192,9 @@ env['HAVE_WX'] = conf.CheckWXConfig('2.8', ['adv', 'core', 'base'],
#osx 64 specifics
if sys.platform == 'darwin':
if env['osx'] == '64coca':
if env['osx'] == '64cocoa':
compileFlags += ['-arch' , 'x86_64', '-DOSX64']
if env['osx'] == '64coca' or env['osx'] == '32coca':
if not env['osx'] == '32x11':
env['HAVE_X11'] = 0
env['HAVE_COCOA'] = conf.CheckPKG('cocoa')
else:
@ -219,7 +219,6 @@ conf.Finish()
#wx windows flags
if env['HAVE_WX']:
wxconfig.ParseWXConfig(env)
compileFlags += ['-DUSE_WX']
else:
print "WX not found or disabled, not building GUI"