From ace2ea395dbed0fd7f8962e8bd0bd4002aecabd0 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Mon, 2 Feb 2009 22:47:29 +0000
Subject: [PATCH] compile fixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2077 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/SConscript          | 10 +++-------
 Source/Core/DolphinWX/Src/ConfigMain.cpp | 12 +++++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index ddfffc9149..fba90e3b2a 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -48,16 +48,16 @@ files = ["Console.cpp",
          "HW/MemoryInterface.cpp",
          "HW/PeripheralInterface.cpp",
          "HW/PixelEngine.cpp",
-         "HW/SI.cpp",
          "HW/SI_Device.cpp",
-         "HW/SI_DeviceGBAController.cpp",
+         "HW/SI_DeviceGBA.cpp",
          "HW/SI_DeviceGCController.cpp",
          "HW/StreamADPCM.cpp",
          "HW/SystemTimers.cpp",
          "HW/VideoInterface.cpp",
          "HW/WII_IOB.cpp",
          "HW/WII_IPC.cpp",
-		 "IPC_HLE/HW/SDInterface.cpp",
+         "HW/SI_Channel.cpp",
+         "IPC_HLE/HW/SDInterface.cpp",
          "IPC_HLE/WII_IPC_HLE.cpp",
          "IPC_HLE/WII_IPC_HLE_Device_DI.cpp",
          "IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp",
@@ -67,10 +67,6 @@ files = ["Console.cpp",
          "IPC_HLE/WII_IPC_HLE_WiiMote.cpp",
          "IPC_HLE/WII_IPC_HLE_Device_usb.cpp",
          "IPC_HLE/WiiMote_HID_Attr.cpp",
-#         "Plugins/Plugin_DSP.cpp",
-#         "Plugins/Plugin_PAD.cpp",
-#         "Plugins/Plugin_Video.cpp",
-#         "Plugins/Plugin_Wiimote.cpp",
          "PowerPC/PowerPC.cpp",
          "PowerPC/PPCAnalyst.cpp",
          "PowerPC/PPCTables.cpp",
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 067d8ed833..949d042e29 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -309,8 +309,8 @@ void CConfigMain::CreateGUIControls()
 	GCEXIDeviceText[1] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTB_TEXT, wxT("Slot B"), wxDefaultPosition, wxDefaultSize);
 	GCEXIDeviceText[2] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SP1_TEXT,	wxT("SP1   "), wxDefaultPosition, wxDefaultSize);
 	GCEXIDeviceText[2]->SetToolTip(wxT("Serial Port 1 - This is the port the network adapter uses"));
-	const wxString SlotDevices[] = {"null","Memory Card", "Mic"};
-	const wxString SP1Devices[] = {"null","BBA"};
+	const wxString SlotDevices[] = {wxT("null"),wxT("Memory Card"), wxT("Mic")};
+	const wxString SP1Devices[] = {wxT("null"),wxT("BBA")};
 	GCEXIDevice[0] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTA, wxDefaultPosition, wxDefaultSize, 3, SlotDevices, 0, wxDefaultValidator);
 	GCEXIDevice[1] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTB, wxDefaultPosition, wxDefaultSize, 3, SlotDevices, 0, wxDefaultValidator);
 	GCEXIDevice[2] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SP1, wxDefaultPosition, wxDefaultSize, 2, SP1Devices, 0, wxDefaultValidator);
@@ -338,7 +338,7 @@ void CConfigMain::CreateGUIControls()
 	GCSIDeviceText[1] = new wxStaticText(GamecubePage, ID_GC_SIDEVICE_TEXT, wxT("Port 2"), wxDefaultPosition, wxDefaultSize);
 	GCSIDeviceText[2] = new wxStaticText(GamecubePage, ID_GC_SIDEVICE_TEXT, wxT("Port 3"), wxDefaultPosition, wxDefaultSize);
 	GCSIDeviceText[3] = new wxStaticText(GamecubePage, ID_GC_SIDEVICE_TEXT, wxT("Port 4"), wxDefaultPosition, wxDefaultSize);
-	const wxString SIDevices[] = {"null","Standard Controller"};
+	const wxString SIDevices[] = {wxT("null"),wxT("Standard Controller")};
 	GCSIDevice[0] = new wxChoice(GamecubePage, ID_GC_SIDEVICE0, wxDefaultPosition, wxDefaultSize, 2, SIDevices, 0, wxDefaultValidator);
 	GCSIDevice[1] = new wxChoice(GamecubePage, ID_GC_SIDEVICE1, wxDefaultPosition, wxDefaultSize, 2, SIDevices, 0, wxDefaultValidator);
 	GCSIDevice[2] = new wxChoice(GamecubePage, ID_GC_SIDEVICE2, wxDefaultPosition, wxDefaultSize, 2, SIDevices, 0, wxDefaultValidator);
@@ -684,8 +684,10 @@ void CConfigMain::GCSettingsChanged(wxCommandEvent& event)
 
 void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA)
 {
-	std::string filename = std::string(wxFileSelector(wxT("Choose a file to open"),
-		wxT(FULL_GC_USER_DIR), wxT(isSlotA ? GC_MEMCARDA:GC_MEMCARDB), wxEmptyString,
+	std::string filename = std::string(wxFileSelector
+									   (wxT("Choose a file to open"),
+										wxT(FULL_GC_USER_DIR), isSlotA ? wxT(GC_MEMCARDA):wxT(GC_MEMCARDB), 
+										wxEmptyString,
 		wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp")).mb_str());
 	if (!filename.empty())
 		strMemcard = filename;