ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Externals build framework for wxWidgets 2.9.2+. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7118 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-08 15:30:32 +00:00
parent 1f1c9132a6
commit dbd381755b
4 changed files with 2622 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1361
Externals/wxWidgets3/SConscript vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1250
Externals/wxWidgets3/wx/setup.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

16
SConstruct
View File

@ -146,6 +146,7 @@ if sys.platform == 'darwin':
if env['nowx']:
env['HAVE_WX'] = 0
else:
env['CPPDEFINES'] += ['__WXOSX_COCOA__']
wxenv = env.Clone(CPPPATH = '', LIBPATH = '', LIBS = '')
conf = wxenv.Configure(conf_dir = None, log_file = None,
custom_tests = {'CheckWXConfig' : wxconfig.CheckWXConfig})
@ -154,13 +155,16 @@ if sys.platform == 'darwin':
env['flavor'] == 'debug')
conf.Finish()
if not env['HAVE_WX']:
print '\nWARNING:'
print 'wxWidgets 2.9.2 not found using ' + wxenv['wxconfig']
print '\nwxWidgets r66814 or newer is required to build Dolphin.'
print 'See http://code.google.com/p/dolphin-emu/wiki/MacOSX_Build'
Exit(1)
wxconfig.ParseWXConfig(wxenv)
env['CPPDEFINES'] += ['__WXOSX_COCOA__']
env['CPPPATH'] += wxenv['CPPPATH']
env['wxconfiglibs'] = wxenv['LIBS']
print 'for instructions on building and installing wxWidgets.\n'
env['wxconfiglibs'] = []
else:
wxconfig.ParseWXConfig(wxenv)
env['CPPPATH'] += wxenv['CPPPATH']
env['wxconfiglibs'] = wxenv['LIBS']
env['data_dir'] = '#' + env['prefix'] + '/Dolphin.app/Contents/Resources'
env['shared_zlib'] = True
@ -329,7 +333,7 @@ dirs = [
'Externals/SDL',
'Externals/SOIL',
'Externals/SFML/src',
#'Externals/wxWidgets',
'Externals/wxWidgets3',
'Externals/zlib',
'Source/Core/AudioCommon/Src',
'Source/Core/Common/Src',

2
Source/Core/DolphinWX/Src/SConscript
View File

@ -48,6 +48,7 @@ if sys.platform == 'win32':
elif sys.platform == 'darwin':
env['CPPPATH'] += ['#Externals']
env['FRAMEWORKPATH'] += ['Externals/Cg']
env['LIBS'] += ['expat', 'iconv']
frameworksflags += ['-Wl,-weak_framework,Cg']
frameworksflags += ['-Wl,-weak_framework,OpenCL']
@ -61,7 +62,6 @@ elif sys.platform == 'darwin':
frameworksflags += ['-Wl,-weak_framework,WebKit']
frameworksflags += ['-Wl,-no_arch_warnings']
else:
env['LIBS'] += ['iconv']
exe += 'NoGUI'
env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +