From 961ac547431ca4abb76cf563f8b8c4cee75ac47d Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Tue, 15 Feb 2011 20:18:50 +0000
Subject: [PATCH] Disable use of exceptions in the wxWidgets3 build.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7177 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Externals/wxWidgets3/SConscript      | 1 -
 Externals/wxWidgets3/wx/wxcocoa.h    | 4 ++--
 Externals/wxWidgets3/wx/wxgtk.h      | 4 ++--
 Externals/wxWidgets3/wx/wxmsw.h      | 4 ++--
 SConstruct                           | 2 ++
 Source/Core/DolphinWX/Src/SConscript | 1 -
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Externals/wxWidgets3/SConscript b/Externals/wxWidgets3/SConscript
index a705cd342b..51bfaa3727 100644
--- a/Externals/wxWidgets3/SConscript
+++ b/Externals/wxWidgets3/SConscript
@@ -11,7 +11,6 @@ env['HAVE_WX'] = 1
 
 wxenv = env.Clone()
 
-wxenv['CCFLAGS'] += ['-fexceptions']
 wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations']
 wxenv['CCFLAGS'] += ['-Wno-shadow', '-Wno-sign-compare']
 wxenv['CPPDEFINES'] += ['WXBUILDING']
diff --git a/Externals/wxWidgets3/wx/wxcocoa.h b/Externals/wxWidgets3/wx/wxcocoa.h
index cbc91229b7..9e63ff0e63 100644
--- a/Externals/wxWidgets3/wx/wxcocoa.h
+++ b/Externals/wxWidgets3/wx/wxcocoa.h
@@ -186,7 +186,7 @@
 #define wxUSE_WCHAR_T 1
 
 
-#define wxUSE_EXCEPTIONS 1
+#define wxUSE_EXCEPTIONS 0
 
 #define wxUSE_EXTENDED_RTTI 0
 
@@ -247,7 +247,7 @@
 
 #define wxUSE_STOPWATCH 1
 
-#define wxUSE_FSWATCHER 1
+#define wxUSE_FSWATCHER 0
 
 #define wxUSE_CONFIG 1
 
diff --git a/Externals/wxWidgets3/wx/wxgtk.h b/Externals/wxWidgets3/wx/wxgtk.h
index b2d58dcee9..f20e4072d1 100644
--- a/Externals/wxWidgets3/wx/wxgtk.h
+++ b/Externals/wxWidgets3/wx/wxgtk.h
@@ -186,7 +186,7 @@
 #define wxUSE_WCHAR_T 1
 
 
-#define wxUSE_EXCEPTIONS 1
+#define wxUSE_EXCEPTIONS 0
 
 #define wxUSE_EXTENDED_RTTI 0
 
@@ -247,7 +247,7 @@
 
 #define wxUSE_STOPWATCH 1
 
-#define wxUSE_FSWATCHER 1
+#define wxUSE_FSWATCHER 0
 
 #define wxUSE_CONFIG 1
 
diff --git a/Externals/wxWidgets3/wx/wxmsw.h b/Externals/wxWidgets3/wx/wxmsw.h
index fbd560fb1c..aa7a997702 100644
--- a/Externals/wxWidgets3/wx/wxmsw.h
+++ b/Externals/wxWidgets3/wx/wxmsw.h
@@ -192,7 +192,7 @@
 //
 // Recommended setting: depends on whether you intend to use C++ exceptions
 //                      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
 //
@@ -435,7 +435,7 @@
 // Default is 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
 // which allow the application to store its settings in the persistent
diff --git a/SConstruct b/SConstruct
index 8d299ab4c5..923eaaa512 100644
--- a/SConstruct
+++ b/SConstruct
@@ -204,6 +204,8 @@ else:
     if not conf.CheckPKGConfig('0.15.0'):
         print "Can't find pkg-config, some tests will fail"
 
+    conf.CheckPKG('iconv')
+
     if env['shared_glew']:
         env['shared_glew'] = conf.CheckPKG('GLEW')
     if env['shared_png']:
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 9bc35c3ec2..998826144f 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -131,7 +131,6 @@ elif sys.platform == 'darwin':
 		)))
 
 else:
-	env['LIBS'] += ['iconv']
 	files += ['X11Utils.cpp']
 	exe = env['binary_dir'] + '/dolphin-emu'
 	if not env['HAVE_WX']: