Various minor fixes to allow building with clang on OS X.

Fixes issue 3992. 

wxWidgets patch at http://trac.wxwidgets.org/ticket/12332 .


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6929 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/Frame.cpp

@@ -32,7 +32,6 @@
 #include "Frame.h"
 #include "ConfigMain.h"
 #include "PluginManager.h"
-#include "MemcardManager.h"
 #include "CheatsWindow.h"
 #include "AboutDolphin.h"
 #include "GameListCtrl.h"

Source/Core/DolphinWX/Src/FrameAui.cpp

@@ -28,7 +28,6 @@
 #include "Frame.h"
 #include "ConfigMain.h"
 #include "PluginManager.h"
-#include "MemcardManager.h"
 #include "CheatsWindow.h"
 #include "AboutDolphin.h"
 #include "GameListCtrl.h"

Source/Core/DolphinWX/Src/LuaWindow.cpp

@@ -214,8 +214,9 @@ void wxLuaWindow::LuaCloseCallback(u64 userdata, int)
 }
 void wxLuaWindow::LuaStartCallback(u64 userdata, int)
 {
-	int luaID = (int)userdata;
-	Lua::RunLuaScriptFile(luaID, (const char *)g_contextMap[luaID]->currentScript.mb_str());
+	int lid = (int)userdata;
+	Lua::RunLuaScriptFile(lid,
+		(const char *)g_contextMap[lid]->currentScript.mb_str());
 }
 void wxLuaWindow::LuaStopCallback(u64 userdata, int)
 {

Source/Core/DolphinWX/Src/SConscript

@@ -61,6 +61,7 @@ if sys.platform == 'win32':
 	files += [ "stdafx.cpp" ]
 elif sys.platform == 'darwin':
 	ldflags += [ '-Wl,-pagezero_size,0x1000' ]
+	ldflags += [ '-Wl,-ObjC' ] # XXX Hack to include wxGLCanvas
 	libs += [ 'iconv' ]
 	exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'