Trying to get Dolphin to compile in Xcode, had to rename the Debugger namespace to something else since the name collided in OS X when using Xcode/Cocoa. Everything compiles except for the GL plugin, and the actual main Dolphin program. Will be trying to get them to compile after sleeping

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

Externals/WiiUseSrc/Src/SConscript

@@ -8,15 +8,15 @@ if not (env['HAVE_BLUEZ'] or sys.platform == 'darwin'):
     Return()
 
 files = [
-	"classic.c",
-        "dynamics.c",
-        "events.c",
-        "io.c",
-        "ir.c",
-        "nunchuk.c",
-        "guitar_hero_3.c",
-        "wiiboard.c",
-        "wiiuse.c",
+	"classic.cpp",
+        "dynamics.cpp",
+        "events.cpp",
+        "io.cpp",
+        "ir.cpp",
+        "nunchuk.cpp",
+        "guitar_hero_3.cpp",
+        "wiiboard.cpp",
+        "wiiuse.cpp",
 	]
 
 if env['HAVE_BLUEZ']:

Source/Core/AudioCommon/Src/OpenALStream.cpp

@@ -33,7 +33,7 @@ bool OpenALStream::Start()
 	pDeviceList = new ALDeviceList();
 	if ((pDeviceList) && (pDeviceList->GetNumDevices()))
 	{
-		pDevice = alcOpenDevice((const ALCchar *)pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice()));
+		pDevice = alcOpenDevice((ALCubyte *)pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice()));
 		if (pDevice)
 		{
 			pContext = alcCreateContext(pDevice, NULL);

Source/Core/Core/Src/Boot/Boot.cpp

@@ -316,7 +316,7 @@ bool CBoot::BootUp()
 			
             Boot_ELF(_StartupPara.m_strFilename.c_str()); 
             UpdateDebugger_MapLoaded();
-			Debugger::AddAutoBreakpoints();
+			Dolphin_Debugger::AddAutoBreakpoints();
 
 			
             HLE::PatchFunctions();

Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp

@@ -23,9 +23,9 @@
 #include "../PowerPC/PowerPC.h"
 #include "../PowerPC/PPCAnalyst.h"
 #include "../PowerPC/PPCSymbolDB.h"
-#include "../../../../Externals/Bochs_disasm/PowerPCDisasm.h"
+#include "Bochs_disasm/PowerPCDisasm.h"
 
-namespace Debugger
+namespace Dolphin_Debugger
 {
 
 void AddAutoBreakpoints()

Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h

@@ -23,7 +23,7 @@
 
 #include "Common.h"
 
-namespace Debugger
+namespace Dolphin_Debugger
 {
 
 struct CallstackEntry 

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp

@@ -590,7 +590,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRemoteNameReq(bdaddr_t _bd)
 
 /////////////////////////////////////////////////////////////
 /* This is called from Update() after ScanEnable has been enabled. */
-// ¯¯¯¯¯¯¯¯¯
+// ØØØØØØØØØ
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestConnection(CWII_IPC_HLE_WiiMote& _rWiiMote)
 {
 	// We have to disable scan now to avoid running this function over and over again
@@ -1429,7 +1429,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandWritePageTimeOut(u8* _Input)
 
 /////////////////////////////////////////////////////////////
 /* This will enable ScanEnable so that Update() can start the Wiimote. */
-// ¯¯¯¯¯¯¯¯¯
+// ØØØØØØØØØ
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandWriteScanEnable(u8* _Input)
 {
 	// Command parameters
@@ -1584,7 +1584,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandVendorSpecific_FC4F(u8* _Input,
 	INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4F: (callstack WUDiRemovePatch)");
 	INFO_LOG(WII_IPC_WIIMOTE, "input (size 0x%x):", _Size);
 
-	Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
+	Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
 
 	SendEventCommandComplete(0xFC4F, &Reply, sizeof(hci_status_rp));
 }
@@ -1597,7 +1597,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandVendorSpecific_FC4C(u8* _Input,
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4C:");
 	INFO_LOG(WII_IPC_WIIMOTE, "input (size 0x%x):", _Size);
-	Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
+	Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
 
 	SendEventCommandComplete(0xFC4C, &Reply, sizeof(hci_status_rp));
 }

Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp

@@ -227,7 +227,7 @@ void unknown_instruction(UGeckoInstruction _inst)
 	char disasm[256];
 	DisassembleGekko(Memory::ReadUnchecked_U32(last_pc), last_pc, disasm, 256);
 	printf("Last PC = %08x : %s\n", last_pc, disasm);
-	Debugger::PrintCallstack();
+	Dolphin_Debugger::PrintCallstack();
 	_dbg_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instr %08x at PC = %08x  last_PC = %08x  LR = %08x\n", _inst.hex, PC, last_pc, LR);
 }
 

Source/Core/DebuggerWX/Src/BreakPointDlg.cpp

@@ -20,7 +20,7 @@
 #include "Host.h"
 #include "Debugger.h"
 #include "StringUtil.h"
-#include "PowerPC/PowerPC.h"
+#include "PowerPC.h"
 
 
 BEGIN_EVENT_TABLE(BreakPointDlg,wxDialog)

Source/Core/DebuggerWX/Src/CodeWindow.cpp

@@ -830,9 +830,9 @@ void CCodeWindow::UpdateCallstack()
 {
 	callstack->Clear();
 
-	std::vector<Debugger::CallstackEntry> stack;
+	std::vector<Dolphin_Debugger::CallstackEntry> stack;
 
-	if (Debugger::GetCallstack(stack))
+	if (Dolphin_Debugger::GetCallstack(stack))
 	{
 		for (size_t i = 0; i < stack.size(); i++)
 		{

Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h

@@ -18,7 +18,7 @@
 #ifndef WIIMOTE_HID_H
 #define WIIMOTE_HID_H
 
-#include <CommonTypes.h>
+#include "CommonTypes.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4200)