diff --git a/Externals/wxWidgets3/SConscript b/Externals/wxWidgets3/SConscript
index 830eea6a37..039f40400d 100644
--- a/Externals/wxWidgets3/SConscript
+++ b/Externals/wxWidgets3/SConscript
@@ -7,9 +7,11 @@ if env['HAVE_WX'] or env['nowx']:
 	Return()
 
 env['CPPPATH'] += ['#Externals/wxWidgets3', '#Externals/wxWidgets3/include']
+env['HAVE_WX'] = 1
 
 wxenv = env.Clone()
 
+wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations', '-Wno-shadow']
 wxenv['CPPDEFINES'] += ['WXBUILDING']
 if sys.platform == 'darwin':
 	wxenv['CPPDEFINES'] += ['__WXMAC__', '__WXOSX__'] # ['__WXOSX_COCOA__']
@@ -372,162 +374,93 @@ generic = [
 	]
 
 gtk = [
-	#'src/gtk/aboutdlg.cpp',
-	#'src/gtk/animate.cpp',
-	#'src/gtk/app.cpp',
-	#'src/gtk/artgtk.cpp',
-	#'src/gtk/assertdlg_gtk.c',
-	#'src/gtk/bitmap.cpp',
-	#'src/gtk/bmpbuttn.cpp',
-	#'src/gtk/bmpcbox.cpp',
-	#'src/gtk/brush.cpp',
-	#'src/gtk/button.cpp',
-	#'src/gtk/calctrl.cpp',
-	#'src/gtk/checkbox.cpp',
-	#'src/gtk/checklst.cpp',
-	#'src/gtk/choice.cpp',
-	#'src/gtk/clipbrd.cpp',
-	#'src/gtk/clrpicker.cpp',
-	#'src/gtk/collpane.cpp',
-	#'src/gtk/colordlg.cpp',
-	#'src/gtk/colour.cpp',
-	#'src/gtk/combobox.cpp',
-	#'src/gtk/control.cpp',
-	#'src/gtk/cursor.cpp',
-	#'src/gtk/dataobj.cpp',
-	#'src/gtk/dataview.cpp',
-	#'src/gtk/dc.cpp',
-	#'src/gtk/dcclient.cpp',
-	#'src/gtk/dcmemory.cpp',
-	#'src/gtk/dcscreen.cpp',
-	#'src/gtk/dialog.cpp',
-	#'src/gtk/dirdlg.cpp',
-	#'src/gtk/dnd.cpp',
-	#'src/gtk/eggtrayicon.c',
-	#'src/gtk/evtloop.cpp',
-	#'src/gtk/filectrl.cpp',
-	#'src/gtk/filedlg.cpp',
-	#'src/gtk/filehistory.cpp',
-	#'src/gtk/filepicker.cpp',
-	#'src/gtk/font.cpp',
-	#'src/gtk/fontdlg.cpp',
-	#'src/gtk/fontpicker.cpp',
-	#'src/gtk/frame.cpp',
-	#'src/gtk/gauge.cpp',
-	#'src/gtk/glcanvas.cpp',
-	#'src/gtk/gnome/gprint.cpp',
-	#'src/gtk/gnome/gvfs.cpp',
-	#'src/gtk/hildon/notifmsg.cpp',
-	#'src/gtk/hyperlink.cpp',
-	#'src/gtk/infobar.cpp',
-	#'src/gtk/listbox.cpp',
-	#'src/gtk/mdi.cpp',
-	#'src/gtk/menu.cpp',
-	#'src/gtk/minifram.cpp',
-	#'src/gtk/mnemonics.cpp',
-	#'src/gtk/msgdlg.cpp',
-	#'src/gtk/nativewin.cpp',
-	#'src/gtk/notebook.cpp',
-	#'src/gtk/pen.cpp',
-	#'src/gtk/popupwin.cpp',
-	#'src/gtk/print.cpp',
-	#'src/gtk/private.cpp',
-	#'src/gtk/radiobox.cpp',
-	#'src/gtk/radiobut.cpp',
-	#'src/gtk/region.cpp',
-	#'src/gtk/renderer.cpp',
-	#'src/gtk/scrolbar.cpp',
-	#'src/gtk/scrolwin.cpp',
-	#'src/gtk/settings.cpp',
-	#'src/gtk/slider.cpp',
-	#'src/gtk/sockgtk.cpp',
-	#'src/gtk/spinbutt.cpp',
-	#'src/gtk/spinctrl.cpp',
-	#'src/gtk/statbmp.cpp',
-	#'src/gtk/statbox.cpp',
-	#'src/gtk/statline.cpp',
-	#'src/gtk/stattext.cpp',
-	#'src/gtk/taskbar.cpp',
-	#'src/gtk/textctrl.cpp',
-	#'src/gtk/textentry.cpp',
-	#'src/gtk/tglbtn.cpp',
-	#'src/gtk/timer.cpp',
-	#'src/gtk/toolbar.cpp',
-	#'src/gtk/tooltip.cpp',
-	#'src/gtk/toplevel.cpp',
-	#'src/gtk/treeentry_gtk.c',
-	#'src/gtk/utilsgtk.cpp',
-	#'src/gtk/win_gtk.cpp',
-	#'src/gtk/window.cpp',
-	#'src/gtk1/app.cpp',
-	#'src/gtk1/artgtk.cpp',
-	#'src/gtk1/bitmap.cpp',
-	#'src/gtk1/bmpbuttn.cpp',
-	#'src/gtk1/brush.cpp',
-	#'src/gtk1/button.cpp',
-	#'src/gtk1/checkbox.cpp',
-	#'src/gtk1/checklst.cpp',
-	#'src/gtk1/choice.cpp',
-	#'src/gtk1/clipbrd.cpp',
-	#'src/gtk1/colour.cpp',
-	#'src/gtk1/combobox.cpp',
-	#'src/gtk1/control.cpp',
-	#'src/gtk1/cursor.cpp',
-	#'src/gtk1/data.cpp',
-	#'src/gtk1/dataobj.cpp',
-	#'src/gtk1/dc.cpp',
-	#'src/gtk1/dcclient.cpp',
-	#'src/gtk1/dcmemory.cpp',
-	#'src/gtk1/dcscreen.cpp',
-	#'src/gtk1/dialog.cpp',
-	#'src/gtk1/dnd.cpp',
-	#'src/gtk1/eggtrayicon.c',
-	#'src/gtk1/evtloop.cpp',
-	#'src/gtk1/filedlg.cpp',
-	#'src/gtk1/font.cpp',
-	#'src/gtk1/fontdlg.cpp',
-	#'src/gtk1/frame.cpp',
-	#'src/gtk1/gauge.cpp',
-	#'src/gtk1/glcanvas.cpp',
-	#'src/gtk1/gnome/gprint.cpp',
-	#'src/gtk1/listbox.cpp',
-	#'src/gtk1/main.cpp',
-	#'src/gtk1/mdi.cpp',
-	#'src/gtk1/menu.cpp',
-	#'src/gtk1/minifram.cpp',
-	#'src/gtk1/mnemonics.cpp',
-	#'src/gtk1/msgdlg.cpp',
-	#'src/gtk1/notebook.cpp',
-	#'src/gtk1/pen.cpp',
-	#'src/gtk1/popupwin.cpp',
-	#'src/gtk1/radiobox.cpp',
-	#'src/gtk1/radiobut.cpp',
-	#'src/gtk1/region.cpp',
-	#'src/gtk1/renderer.cpp',
-	#'src/gtk1/scrolbar.cpp',
-	#'src/gtk1/scrolwin.cpp',
-	#'src/gtk1/settings.cpp',
-	#'src/gtk1/slider.cpp',
-	#'src/gtk1/sockgtk.cpp',
-	#'src/gtk1/spinbutt.cpp',
-	#'src/gtk1/spinctrl.cpp',
-	#'src/gtk1/statbmp.cpp',
-	#'src/gtk1/statbox.cpp',
-	#'src/gtk1/statline.cpp',
-	#'src/gtk1/stattext.cpp',
-	#'src/gtk1/taskbar.cpp',
-	#'src/gtk1/textctrl.cpp',
-	#'src/gtk1/tglbtn.cpp',
-	#'src/gtk1/threadno.cpp',
-	#'src/gtk1/threadsgi.cpp',
-	#'src/gtk1/timer.cpp',
-	#'src/gtk1/toolbar.cpp',
-	#'src/gtk1/tooltip.cpp',
-	#'src/gtk1/toplevel.cpp',
-	#'src/gtk1/utilsgtk.cpp',
-	#'src/gtk1/utilsres.cpp',
-	#'src/gtk1/win_gtk.c',
-	#'src/gtk1/window.cpp',
+	'src/gtk/aboutdlg.cpp',
+	'src/gtk/animate.cpp',
+	'src/gtk/app.cpp',
+	'src/gtk/artgtk.cpp',
+	'src/gtk/assertdlg_gtk.c',
+	'src/gtk/bitmap.cpp',
+	'src/gtk/bmpbuttn.cpp',
+	'src/gtk/bmpcbox.cpp',
+	'src/gtk/brush.cpp',
+	'src/gtk/button.cpp',
+	'src/gtk/calctrl.cpp',
+	'src/gtk/checkbox.cpp',
+	'src/gtk/checklst.cpp',
+	'src/gtk/choice.cpp',
+	'src/gtk/clipbrd.cpp',
+	'src/gtk/clrpicker.cpp',
+	'src/gtk/collpane.cpp',
+	'src/gtk/colordlg.cpp',
+	'src/gtk/colour.cpp',
+	'src/gtk/combobox.cpp',
+	'src/gtk/control.cpp',
+	'src/gtk/cursor.cpp',
+	'src/gtk/dataobj.cpp',
+	'src/gtk/dataview.cpp',
+	'src/gtk/dc.cpp',
+	'src/gtk/dcclient.cpp',
+	'src/gtk/dcmemory.cpp',
+	'src/gtk/dcscreen.cpp',
+	'src/gtk/dialog.cpp',
+	'src/gtk/dirdlg.cpp',
+	'src/gtk/dnd.cpp',
+	'src/gtk/eggtrayicon.c',
+	'src/gtk/evtloop.cpp',
+	'src/gtk/filectrl.cpp',
+	'src/gtk/filedlg.cpp',
+	'src/gtk/filehistory.cpp',
+	'src/gtk/filepicker.cpp',
+	'src/gtk/font.cpp',
+	'src/gtk/fontdlg.cpp',
+	'src/gtk/fontpicker.cpp',
+	'src/gtk/frame.cpp',
+	'src/gtk/gauge.cpp',
+	'src/gtk/glcanvas.cpp',
+	'src/gtk/gnome/gprint.cpp',
+	'src/gtk/gnome/gvfs.cpp',
+	'src/gtk/hildon/notifmsg.cpp',
+	'src/gtk/hyperlink.cpp',
+	'src/gtk/infobar.cpp',
+	'src/gtk/listbox.cpp',
+	'src/gtk/mdi.cpp',
+	'src/gtk/menu.cpp',
+	'src/gtk/minifram.cpp',
+	'src/gtk/mnemonics.cpp',
+	'src/gtk/msgdlg.cpp',
+	'src/gtk/nativewin.cpp',
+	'src/gtk/notebook.cpp',
+	'src/gtk/pen.cpp',
+	'src/gtk/popupwin.cpp',
+	'src/gtk/print.cpp',
+	'src/gtk/private.cpp',
+	'src/gtk/radiobox.cpp',
+	'src/gtk/radiobut.cpp',
+	'src/gtk/region.cpp',
+	'src/gtk/renderer.cpp',
+	'src/gtk/scrolbar.cpp',
+	'src/gtk/scrolwin.cpp',
+	'src/gtk/settings.cpp',
+	'src/gtk/slider.cpp',
+	'src/gtk/sockgtk.cpp',
+	'src/gtk/spinbutt.cpp',
+	'src/gtk/spinctrl.cpp',
+	'src/gtk/statbmp.cpp',
+	'src/gtk/statbox.cpp',
+	'src/gtk/statline.cpp',
+	'src/gtk/stattext.cpp',
+	'src/gtk/taskbar.cpp',
+	'src/gtk/textctrl.cpp',
+	'src/gtk/textentry.cpp',
+	'src/gtk/tglbtn.cpp',
+	'src/gtk/timer.cpp',
+	'src/gtk/toolbar.cpp',
+	'src/gtk/tooltip.cpp',
+	'src/gtk/toplevel.cpp',
+	'src/gtk/treeentry_gtk.c',
+	'src/gtk/utilsgtk.cpp',
+	'src/gtk/win_gtk.cpp',
+	'src/gtk/window.cpp',
 	]
 
 html = [
@@ -1219,40 +1152,6 @@ unix = [
 	#'src/unix/utilsx11.cpp',
 	]
 
-x11 = [
-	#'src/x11/app.cpp',
-	#'src/x11/bitmap.cpp',
-	#'src/x11/brush.cpp',
-	#'src/x11/clipbrd.cpp',
-	#'src/x11/colour.cpp',
-	#'src/x11/cursor.cpp',
-	#'src/x11/data.cpp',
-	#'src/x11/dataobj.cpp',
-	#'src/x11/dc.cpp',
-	#'src/x11/dcclient.cpp',
-	#'src/x11/dcmemory.cpp',
-	#'src/x11/dcscreen.cpp',
-	#'src/x11/dnd.cpp',
-	#'src/x11/evtloop.cpp',
-	#'src/x11/font.cpp',
-	#'src/x11/glcanvas.cpp',
-	#'src/x11/minifram.cpp',
-	#'src/x11/nanox.c',
-	#'src/x11/palette.cpp',
-	#'src/x11/pango_x.cpp',
-	#'src/x11/pangox11.cpp',
-	#'src/x11/pen.cpp',
-	#'src/x11/popupwin.cpp',
-	#'src/x11/region.cpp',
-	#'src/x11/reparent.cpp',
-	#'src/x11/settings.cpp',
-	#'src/x11/textctrl.cpp',
-	#'src/x11/toplevel.cpp',
-	#'src/x11/utils.cpp',
-	#'src/x11/utilsx.cpp',
-	#'src/x11/window.cpp',
-	]
-
 xrc = [
 	'src/xml/xml.cpp',
 	'src/xrc/xh_animatctrl.cpp',
@@ -1339,16 +1238,19 @@ zlib = [
 if sys.platform == 'darwin':
 	env['LIBS'] += wxenv.StaticObject(osx)
 	env['LIBS'] += wxenv.StaticObject(unix)
+else:
+	env['LIBS'] += wxenv.StaticObject(gtk)
+	env['LIBS'] += wxenv.StaticObject(unix)
 env['LIBS'] += wxenv.StaticObject(aui)
 env['LIBS'] += wxenv.StaticObject(common)
 env['LIBS'] += wxenv.StaticObject(generic)
-env['LIBS'] += wxenv.StaticObject(html)
-env['LIBS'] += wxenv.StaticObject(propgrid)
-env['LIBS'] += wxenv.StaticObject(ribbon)
-env['LIBS'] += wxenv.StaticObject(richtext)
-env['LIBS'] += wxenv.StaticObject(xrc)
-wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/regex']
-env['LIBS'] += wxenv.StaticObject(regex)
+#env['LIBS'] += wxenv.StaticObject(html)
+#env['LIBS'] += wxenv.StaticObject(propgrid)
+#env['LIBS'] += wxenv.StaticObject(ribbon)
+#env['LIBS'] += wxenv.StaticObject(richtext)
+#env['LIBS'] += wxenv.StaticObject(xrc)
+#wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/regex']
+#env['LIBS'] += wxenv.StaticObject(regex)
 wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/png']
 env['LIBS'] += wxenv.StaticObject(png)
 #wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/jpeg']
diff --git a/Externals/wxWidgets3/wx/setup.h b/Externals/wxWidgets3/wx/wxcocoa.h
similarity index 99%
rename from Externals/wxWidgets3/wx/setup.h
rename to Externals/wxWidgets3/wx/wxcocoa.h
index 9921380cb2..cbc91229b7 100644
--- a/Externals/wxWidgets3/wx/setup.h
+++ b/Externals/wxWidgets3/wx/wxcocoa.h
@@ -303,7 +303,7 @@
 
 #define wxUSE_ANY 1
 
-#define wxUSE_REGEX 1
+#define wxUSE_REGEX 0
 
 #define wxUSE_SYSTEM_OPTIONS 1
 
@@ -311,15 +311,15 @@
 
 #define wxUSE_MEDIACTRL 1
 
-#define wxUSE_XRC 1
+#define wxUSE_XRC 0
 
 #define wxUSE_XML 1
 
 #define wxUSE_AUI 1
 
-#define wxUSE_RIBBON 1
+#define wxUSE_RIBBON 0
 
-#define wxUSE_PROPGRID 1
+#define wxUSE_PROPGRID 0
 
 #define wxUSE_STC 0
 
@@ -511,11 +511,11 @@
 
 #define wxUSE_PRINTING_ARCHITECTURE 1
 
-#define wxUSE_HTML 1
+#define wxUSE_HTML 0
 
 #define wxUSE_GLCANVAS 1
 
-#define wxUSE_RICHTEXT 1
+#define wxUSE_RICHTEXT 0
 
 
 #define wxUSE_CLIPBOARD 1
@@ -539,7 +539,7 @@
 #define wxUSE_MS_HTML_HELP 0
 
 
-#define wxUSE_WXHTML_HELP 1
+#define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_CONSTRAINTS 1
 
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 8ce249ec03..a059030f56 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -62,7 +62,7 @@ if sys.platform == 'win32':
 elif sys.platform == 'darwin':
 	env['CPPPATH'] += ['#Externals']
 	env['FRAMEWORKPATH'] += ['Externals/Cg']
-	env['LIBS'] += ['expat', 'iconv']
+	env['LIBS'] += ['iconv']
 	frameworksflags += ['-Wl,-weak_framework,Cg']
 	frameworksflags += ['-Wl,-weak_framework,OpenCL']
 
@@ -131,6 +131,7 @@ elif sys.platform == 'darwin':
 		)))
 
 else:
+	env['LIBS'] += ['iconv']
 	files += ['X11Utils.cpp']
 	exe = env['binary_dir'] + '/dolphin-emu'
 	if not env['HAVE_WX']: