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

Allow building with wxgtk 2.9.2 in Externals.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7155 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-02-12 22:31:57 +00:00
parent 8b166a3c6a
commit 5b75a59d2a
8 changed files with 3209 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SConstruct
View File

@ -226,13 +226,18 @@ else:
if env['nowx']:
env['HAVE_WX'] = 0
else:
if not conf.CheckPKG('gtk+-2.0'):
print "gtk+-2.0 developement headers not detected"
print "gtk+-2.0 is required to build the WX GUI"
Exit(1)
env['CPPDEFINES'] += ['__WXGTK__']
conf.Define('HAVE_WX', 1)
env['HAVE_WX'] = conf.CheckWXConfig(2.8, 'aui adv core base'.split(),
env['flavor'] == 'debug')
conf.Define('HAVE_WX', env['HAVE_WX'])
wxconfig.ParseWXConfig(env)
if not env['HAVE_WX']:
if env['HAVE_WX']:
wxconfig.ParseWXConfig(env)
else:
print "wxWidgets not found - see config.log"
Exit(1)
env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ'])
@ -253,11 +258,6 @@ else:
conf.Define('HAVE_XRANDR', env['HAVE_XRANDR'])
conf.Define('HAVE_X11', env['HAVE_X11'])
if env['HAVE_WX'] and not conf.CheckPKG('gtk+-2.0'):
print "gtk+-2.0 developement headers not detected"
print "gtk+-2.0 is required to build the WX GUI"
Exit(1)
if not conf.CheckPKG('GL'):
print "Must have OpenGL to build"
Exit(1)