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

Disable use of exceptions in the wxWidgets3 build. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7177 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-15 20:18:50 +00:00
parent d7bda211fd
commit 961ac54743
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Externals/wxWidgets3/SConscript vendored
View File

@ -11,7 +11,6 @@ env['HAVE_WX'] = 1
wxenv = env.Clone() wxenv = env.Clone()
wxenv['CCFLAGS'] += ['-fexceptions']
wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations'] wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations']
wxenv['CCFLAGS'] += ['-Wno-shadow', '-Wno-sign-compare'] wxenv['CCFLAGS'] += ['-Wno-shadow', '-Wno-sign-compare']
wxenv['CPPDEFINES'] += ['WXBUILDING'] wxenv['CPPDEFINES'] += ['WXBUILDING']

4
Externals/wxWidgets3/wx/wxcocoa.h vendored
View File

@ -186,7 +186,7 @@
#define wxUSE_WCHAR_T 1 #define wxUSE_WCHAR_T 1
#define wxUSE_EXCEPTIONS 1 #define wxUSE_EXCEPTIONS 0
#define wxUSE_EXTENDED_RTTI 0 #define wxUSE_EXTENDED_RTTI 0
@ -247,7 +247,7 @@
#define wxUSE_STOPWATCH 1 #define wxUSE_STOPWATCH 1
#define wxUSE_FSWATCHER 1 #define wxUSE_FSWATCHER 0
#define wxUSE_CONFIG 1 #define wxUSE_CONFIG 1

4
Externals/wxWidgets3/wx/wxgtk.h vendored
View File

@ -186,7 +186,7 @@
#define wxUSE_WCHAR_T 1 #define wxUSE_WCHAR_T 1
#define wxUSE_EXCEPTIONS 1 #define wxUSE_EXCEPTIONS 0
#define wxUSE_EXTENDED_RTTI 0 #define wxUSE_EXTENDED_RTTI 0
@ -247,7 +247,7 @@
#define wxUSE_STOPWATCH 1 #define wxUSE_STOPWATCH 1
#define wxUSE_FSWATCHER 1 #define wxUSE_FSWATCHER 0
#define wxUSE_CONFIG 1 #define wxUSE_CONFIG 1

4
Externals/wxWidgets3/wx/wxmsw.h vendored
View File

@ -192,7 +192,7 @@
// //
// Recommended setting: depends on whether you intend to use C++ exceptions // Recommended setting: depends on whether you intend to use C++ exceptions
// in your own code (1 if you do, 0 if you don't) // in your own code (1 if you do, 0 if you don't)
#define wxUSE_EXCEPTIONS 1 #define wxUSE_EXCEPTIONS 0
// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI // Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
// //
@ -435,7 +435,7 @@
// Default is 1 // Default is 1
// //
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_FSWATCHER 1 #define wxUSE_FSWATCHER 0
// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes // Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
// which allow the application to store its settings in the persistent // which allow the application to store its settings in the persistent

2
SConstruct
View File

@ -204,6 +204,8 @@ else:
if not conf.CheckPKGConfig('0.15.0'): if not conf.CheckPKGConfig('0.15.0'):
print "Can't find pkg-config, some tests will fail" print "Can't find pkg-config, some tests will fail"
conf.CheckPKG('iconv')
if env['shared_glew']: if env['shared_glew']:
env['shared_glew'] = conf.CheckPKG('GLEW') env['shared_glew'] = conf.CheckPKG('GLEW')
if env['shared_png']: if env['shared_png']:

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

@ -131,7 +131,6 @@ elif sys.platform == 'darwin':
))) )))
else: else:
env['LIBS'] += ['iconv']
files += ['X11Utils.cpp'] files += ['X11Utils.cpp']
exe = env['binary_dir'] + '/dolphin-emu' exe = env['binary_dir'] + '/dolphin-emu'
if not env['HAVE_WX']: if not env['HAVE_WX']: