dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-07 15:53:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check that the libraries claimed by wx-config can actually be linked

Browse Source 
with. This avoids having wx problems show up as a problem with a 
subsequent dependency, namely Cg.

See issue #2175.
 
Also add explicit depdendency on zlib.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5607 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-04 21:00:39 +00:00
parent b6a281eaff
commit 63dbcf4f97
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
SConstruct
View File

@ -1,4 +1,4 @@
# -*- python -*-
# -* python -*-
import os
import sys
@ -365,29 +365,37 @@ if sys.platform == 'darwin':
else:
env['HAVE_X11'] = conf.CheckPKG('x11')
env['HAVE_XRANDR'] = env['HAVE_X11'] and conf.CheckPKG('xrandr')
# handling wx flags CCFLAGS should be created before
wxmods = ['aui', 'adv', 'core', 'base']
env['USE_WX'] = 0
if env['wxgl']:
if env['wxgl'] or sys.platform == 'win32' or sys.platform == 'darwin':
env['USE_WX'] = 1
if sys.platform == 'win32' or sys.platform == 'darwin':
env['HAVE_WX'] = 1
env['USE_WX'] = 1
if env['USE_WX']:
wxmods.append('gl')
else:
env['USE_WX'] = 0;
if env['nowx']:
env['USE_WX'] = 0;
if sys.platform == 'darwin':
wxver = '2.9' # 64-bit on OS X
else:
wxver = '2.8'
# gui-less build
if env['nowx']:
env['HAVE_WX'] = 0;
env['USE_WX'] = 0;
else:
if sys.platform == 'darwin':
# 2.9 is needed for 64-bit support on OS X
env['HAVE_WX'] = conf.CheckWXConfig('2.9', wxmods, 0)
else:
env['HAVE_WX'] = conf.CheckWXConfig('2.8', wxmods, 0)
env['HAVE_WX'] = conf.CheckWXConfig(wxver, wxmods, 0)
wxconfig.ParseWXConfig(env)
env['HAVE_WX'] = conf.CheckPKG('c')
if not env['HAVE_WX'] and not env['nowx']:
print "WX not found - see config.log"
Exit(1)
# zlib
env['HAVE_ZLIB'] = conf.CheckPKG('z')
if not ['HAVE_ZLIB']:
print "zlib is required"
Exit(1)
# check for libgtk2.0
env['HAVE_GTK2'] = 0
@ -451,12 +459,6 @@ conf.Define('USE_OPROFILE', env['USE_OPROFILE'])
# After all configuration tests are done
conf.Finish()
#wx windows flags
if env['HAVE_WX']:
wxconfig.ParseWXConfig(env)
else:
print "WX not found or disabled, not building GUI"
rev = utils.GenerateRevFile(env['flavor'],
"Source/Core/Common/Src/svnrev_template.h",
"Source/Core/Common/Src/svnrev.h")