diff --git a/Source/Core/Common/Src/Common.cpp b/Source/Core/Common/Src/Common.cpp
index 704a3d846d..f48fc1a2ac 100644
--- a/Source/Core/Common/Src/Common.cpp
+++ b/Source/Core/Common/Src/Common.cpp
@@ -52,7 +52,7 @@ void PanicAlert(const char* format, ...)
 		//#error Do a messagebox!
 		vprintf(format, args);
 		printf("\n");
-        asm ("int $3") ;
+//        asm ("int $3") ;
 #endif
 	}
 
diff --git a/Source/Core/DolphinWX/src/MemcardManager.cpp b/Source/Core/DolphinWX/src/MemcardManager.cpp
index 144f9be773..bf7130e86a 100644
--- a/Source/Core/DolphinWX/src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/src/MemcardManager.cpp
@@ -101,10 +101,10 @@ void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
 	switch(event.GetId())
 	{
 		case ID_MEMCARD1PATH:
-			LoadMemcard1(event.GetPath());
+			LoadMemcard1(event.GetPath().mb_str());
 			break;
 		case ID_MEMCARD2PATH:
-			LoadMemcard2(event.GetPath());
+			LoadMemcard2(event.GetPath().mb_str());
 			break;
 		default:
 			break;
@@ -175,10 +175,10 @@ void CMemcardManager::LoadMemcard1(const char *card1)
 			if(!memoryCard1->GetComment2(i,comment2)) comment2[0]=0;
 
 			// Add to list control			
-			int index = m_Memcard1List->InsertItem(i, "row");
-			m_Memcard1List->SetItem(index, 0, fileName);
-			m_Memcard1List->SetItem(index, 1, comment1);
-			m_Memcard1List->SetItem(index, 2, comment2);
+			int index = m_Memcard1List->InsertItem(i, wxString::FromAscii("row"));
+			m_Memcard1List->SetItem(index, 0, wxString::FromAscii(fileName));
+			m_Memcard1List->SetItem(index, 1, wxString::FromAscii(comment1));
+			m_Memcard1List->SetItem(index, 2, wxString::FromAscii(comment2));
 		}
 		m_Memcard1List->Show();
 	}
@@ -188,7 +188,7 @@ void CMemcardManager::LoadMemcard1(const char *card1)
 
 		char tmp[128];
 		sprintf(tmp, "Unable to load %s", card1);
-		long item = m_Memcard1List->InsertItem(0, tmp);
+		long item = m_Memcard1List->InsertItem(0, wxString::FromAscii(tmp));
 
 		m_Memcard1List->SetItemFont(item, *wxITALIC_FONT);
 		m_Memcard1List->SetColumnWidth(item, wxLIST_AUTOSIZE);
@@ -227,10 +227,10 @@ void CMemcardManager::LoadMemcard2(const char *card2)
 			if(!memoryCard2->GetComment1(i,comment1)) comment1[0]=0;
 			if(!memoryCard2->GetComment2(i,comment2)) comment2[0]=0;
 
-			int index = m_Memcard2List->InsertItem(i, "row");
-			m_Memcard2List->SetItem(index, 0, fileName);
-			m_Memcard2List->SetItem(index, 1, comment1);
-			m_Memcard2List->SetItem(index, 2, comment2);
+			int index = m_Memcard2List->InsertItem(i, wxString::FromAscii("row"));
+			m_Memcard2List->SetItem(index, 0, wxString::FromAscii(fileName));
+			m_Memcard2List->SetItem(index, 1, wxString::FromAscii(comment1));
+			m_Memcard2List->SetItem(index, 2, wxString::FromAscii(comment2));
 		}
 		m_Memcard2List->Show();
 	}
@@ -240,7 +240,7 @@ void CMemcardManager::LoadMemcard2(const char *card2)
 
 		char tmp[128];
 		sprintf(tmp, "Unable to load %s", card2);
-		long item = m_Memcard2List->InsertItem(0, tmp);
+		long item = m_Memcard2List->InsertItem(0, wxString::FromAscii(tmp));
 
 		m_Memcard2List->SetItemFont(item, *wxITALIC_FONT);
 		m_Memcard2List->SetColumnWidth(item, wxLIST_AUTOSIZE);
diff --git a/Source/Core/DolphinWX/src/MemoryCards/GCMemcard.cpp b/Source/Core/DolphinWX/src/MemoryCards/GCMemcard.cpp
index b374911c44..879e0412c2 100644
--- a/Source/Core/DolphinWX/src/MemoryCards/GCMemcard.cpp
+++ b/Source/Core/DolphinWX/src/MemoryCards/GCMemcard.cpp
@@ -1,8 +1,11 @@
 // gcmc.cpp: define el punto de entrada de la aplicación de consola.
 //
-
+#ifdef _WIN32
 #include "stdafx.h"
+#endif
 #include <assert.h>
+#include <memory.h>
+#include <stdio.h>
 
 #include "GCMemcard.h"
 
diff --git a/Source/Core/DolphinWX/src/SConscript b/Source/Core/DolphinWX/src/SConscript
index ce8f9ad4af..4f5dabf0b9 100644
--- a/Source/Core/DolphinWX/src/SConscript
+++ b/Source/Core/DolphinWX/src/SConscript
@@ -9,6 +9,8 @@ files = ["BootManager.cpp",
         "Globals.cpp",
         "ISOFile.cpp",
         "Main.cpp",
+        "MemcardManager.cpp",
+        "MemoryCards/GCMemcard.cpp",
 #        "MainNoGUI.cpp",
         "PluginManager.cpp",
         "PluginOptions.cpp",