Linux: Fix ups for people running Linux. If it breaks anything, punch me in the face.

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

SConstruct

@@ -1,6 +1,6 @@
 import os
 
-ccflags = '-g -O2 -msse2 -Wall -D_DEBUG -DLOGGING -D_FILE_OFFSET_BITS=64 D_LARGEFILE_SOURCE'
+ccflags = '-g -O2 -msse2 -Wall -DLOGGING -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE'
 
 if False:
 	ccflags += ' -fomit-frame-pointer'
@@ -12,6 +12,7 @@ include_paths = ["../../../Core/Common/Src",
                  "../../../Core/Core/Src",
                  "../../../Core/DebuggerWX/src",
                  "../../../../Externals/Bochs_disasm",
+                 "../../../Core/VideoCommon/Src",
 #                 "../../../Plugins/Plugin_VideoOGL/Src/Windows",
                  ]
 
@@ -20,8 +21,9 @@ dirs = ["Source/Core/Common/Src",
         "Source/Core/Core/Src",
         "Source/Core/DiscIO/Src",
         "Source/Core/DebuggerWX/src",
+        "Source/Core/VideoCommon/Src",
         "Source/Plugins/Plugin_VideoOGL/Src",
-		"Source/Plugins/Plugin_DSP/Src",
+		"Source/Plugins/Plugin_DSP_NULL/Src",
 		"Source/Plugins/Plugin_DSP_LLE/Src",
 		"Source/Plugins/Plugin_PadSimple/Src",
         "Source/Core/DolphinWX/src",
@@ -29,8 +31,8 @@ dirs = ["Source/Core/Common/Src",
 
 lib_paths = include_paths
 
-env = Environment(CC="gcc-4.2", 
-                  CXX="g++-4.2",
+env = Environment(CC="gcc-4.3", 
+                  CXX="g++-4.3",
                   CCFLAGS=ccflags, 
                   CXXFLAGS=ccflags,
                   CPPPATH=include_paths, 

Source/Core/Common/Src/Common.h

@@ -19,6 +19,8 @@
 #define _COMMON_H
 
 #include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef _WIN32
 #define POSIX 0

Source/Core/Common/Src/Plugin.cpp

@@ -15,7 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "plugin.h"
+#include "Plugin.h"
 
 namespace Common
 {

Source/Core/Common/Src/SConscript

@@ -7,6 +7,7 @@ files = ["Common.cpp",
 		 "HTTP.cpp",
          "IniFile.cpp",
 		 "Logging.cpp",
+		 "FileUtil.cpp",
 		 "MappedFile.cpp",
 		 "MathUtil.cpp",
          "MemArena.cpp",

Source/Core/Common/Src/Timer.cpp

@@ -23,7 +23,7 @@
 #include <time.h>
 
 #include "Common.h"
-#include "Timer.H"
+#include "Timer.h"
 
 #ifdef __GNUC__
 #include <sys/timeb.h>

Source/Core/Core/Src/Core.cpp

@@ -22,7 +22,7 @@
 #endif
 
 #include "Thread.h"
-#include "Timer.H"
+#include "Timer.h"
 
 #include "Console.h"
 #include "Core.h"

Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp

@@ -15,7 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Timer.H"
+#include "Timer.h"
 
 #include "EXI_DeviceIPL.h"
 #include "../Core.h"

Source/Core/Core/Src/HW/SystemTimers.cpp

@@ -29,7 +29,7 @@
 #include "../Core.h"
 #include "../IPC_HLE/WII_IPC_HLE.h"
 #include "Thread.h"
-#include "Timer.H"
+#include "Timer.h"
 
 namespace SystemTimers
 {

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp

@@ -161,7 +161,7 @@ IWII_IPC_HLE_Device* CreateDevice(u32 _DeviceID, const std::string& _rDeviceName
 }
 
 std::queue<u32> m_Ack;
-std::queue<std::pair<u32,std::string>> m_ReplyQueue;
+std::queue<std::pair<u32,std::string> > m_ReplyQueue;
 
 void ExecuteCommand(u32 _Address);
 bool AckCommand(u32 _Address)

Source/Core/Core/Src/IPC_HLE/hci.h

@@ -7,7 +7,9 @@
 
 
 typedef u8 uint8_t;
-typedef s8 int8_t;
+#ifdef WIN32
+    typedef s8 int8_t;
+#endif
 typedef u16 uint16_t;
 typedef s16 int16_t;
 typedef u32 uint32_t;

Source/Core/Core/Src/SConscript

@@ -8,7 +8,6 @@ files = ["Console.cpp",
          "PatchEngine.cpp",
          "MemTools.cpp",
          "Tracer.cpp",
-         "GamesIniEntry.cpp",
          "Host.cpp",
          "VolumeHandler.cpp",
          "Boot/Boot.cpp",
@@ -48,6 +47,9 @@ files = ["Console.cpp",
          "IPC_HLE/WII_IPC_HLE.cpp",
          "IPC_HLE/WII_IPC_HLE_Device_DI.cpp",
          "IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp",
+         "IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp",
+         "IPC_HLE/WII_IPC_HLE_Device_usb.cpp",
+         "IPC_HLE/WII_IPC_HLE_WiiMote.cpp",
          "Plugins/Plugin_DSP.cpp",
          "Plugins/Plugin_PAD.cpp",
          "Plugins/Plugin_Video.cpp",
@@ -69,13 +71,12 @@ files = ["Console.cpp",
          "PowerPC/Jit64/Jit_Branch.cpp",
          "PowerPC/Jit64/Jit_Integer.cpp",
          "PowerPC/Jit64/Jit_FloatingPoint.cpp",
+         "PowerPC/Jit64/Jit_LoadStorePaired.cpp",
          "PowerPC/Jit64/Jit_Paired.cpp",
          "PowerPC/Jit64/Jit_LoadStore.cpp",
          "PowerPC/Jit64/Jit_SystemRegisters.cpp",
          "HLE/HLE.cpp",
-         "HLE/HLE_Math.cpp",
          "HLE/HLE_Misc.cpp",
          "HLE/HLE_OS.cpp",
-         "HLE/HLE_Pad.cpp",
         ]
 env.StaticLibrary("core", files, LIBS="bdisasm")

Source/Core/DebuggerWX/src/BreakpointView.cpp

@@ -54,17 +54,22 @@ CBreakPointView::Update()
 		const TBreakPoint& rBP = rBreakPoints[i];
 		if (!rBP.bTemporary)
 		{
-			int Item = InsertItem(0, rBP.bOn ? "on" : " ");
-			SetItem(Item, 1, "BP");
+			wxString temp;
+			temp = wxString::FromAscii(rBP.bOn ? "on" : " ");
+			int Item = InsertItem(0, temp);
+			temp = wxString::FromAscii("BP");
+			SetItem(Item, 1, temp);
 			
 			Debugger::XSymbolIndex index = Debugger::FindSymbol(rBP.iAddress);
 			if (index > 0)
 			{
-				SetItem(Item, 2, Debugger::GetDescription(rBP.iAddress));
+				temp = wxString::FromAscii(Debugger::GetDescription(rBP.iAddress));
+				SetItem(Item, 2, temp);
 			}
 			
             sprintf(szBuffer, "0x%08x", rBP.iAddress);
-			SetItem(Item, 3, szBuffer);
+            temp = wxString::FromAscii(szBuffer);
+			SetItem(Item, 3, temp);
 
             SetItemData(Item, rBP.iAddress);
 		}
@@ -82,4 +87,4 @@ CBreakPointView::Update()
         u32 Address = GetItemData(Item);
         CBreakPoints::DeleteElementByAddress(Address);
     }
-}
+}

Source/Core/DebuggerWX/src/BreakpointWindow.cpp

@@ -3,7 +3,7 @@
 //
 
 #include "Debugger.h"
-#include "BreakPointWindow.h"
+#include "BreakpointWindow.h"
 #include "BreakpointView.h"
 #include "CodeWindow.h"
 #include "HW/Memmap.h"

Source/Core/DebuggerWX/src/CodeView.cpp

@@ -163,14 +163,14 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 		    break;
 
 	    case IDM_COPYCODE:
-		    wxTheClipboard->SetData(new wxTextDataObject(debugger->disasm(selection)));
+		    wxTheClipboard->SetData(new wxTextDataObject(wxString::FromAscii(debugger->disasm(selection)))); //Have to manually convert from char* to wxString, don't have to in Windows?
 		    break;
 
 	    case IDM_COPYHEX:
 	    {
 		    char temp[24];
 		    sprintf(temp, "%08x", debugger->readMemory(selection));
-		    wxTheClipboard->SetData(new wxTextDataObject(temp));
+		    wxTheClipboard->SetData(new wxTextDataObject(wxString::FromAscii(temp)));
 	    }
 		    break;
 #endif
@@ -205,9 +205,9 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event)
 	wxMenu menu;
 	//menu.Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
 #if wxUSE_CLIPBOARD
-	menu.Append(IDM_COPYADDRESS, "Copy &address");
-	menu.Append(IDM_COPYCODE, "Copy &code");
-	menu.Append(IDM_COPYHEX, "Copy &hex");
+	menu.Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address"));
+	menu.Append(IDM_COPYCODE, wxString::FromAscii("Copy &code"));
+	menu.Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex"));
 #endif
 	menu.Append(IDM_RUNTOHERE, _T("&Run To Here"));
 	//menu.Append(IDM_DYNARECRESULTS, "Copy &address");

Source/Core/DebuggerWX/src/CodeWindow.cpp

@@ -39,7 +39,7 @@
 #include "LogManager.h"
 
 // ugly that this lib included code from the main
-#include "../../DolphinWX/src/globals.h"
+#include "../../DolphinWX/src/Globals.h"
 
 class SymbolList
 	: public wxListCtrl
@@ -348,7 +348,7 @@ void CCodeWindow::Update()
 	}
 	else
 	{
-		callstack->Append("invalid callstack");
+		callstack->Append(wxString::FromAscii("invalid callstack"));
 	}
 
 	UpdateButtonStates();

Source/Core/DebuggerWX/src/LogWindow.cpp

@@ -74,7 +74,7 @@ CLogWindow::CLogWindow(wxWindow* parent)
 
 void CLogWindow::OnSubmit(wxCommandEvent& event)
 {
-	Console_Submit(m_cmdline->GetValue().c_str());
+	Console_Submit(m_cmdline->GetValue().To8BitData());
 	m_cmdline->SetValue(_T(""));
 	NotifyUpdate();
 }
@@ -128,7 +128,7 @@ void CLogWindow::UpdateChecks()
 
 		for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
 		{
-			m_checks->Append(LogManager::m_Log[i]->m_szName);
+			m_checks->Append(wxString::FromAscii(LogManager::m_Log[i]->m_szName));
 		}
 
 		m_checks->Show(true);
@@ -218,7 +218,7 @@ void CLogWindow::UpdateLog()
 	}
 
 	*p = 0; //end the string
-	m_log->SetValue(m_logBuffer);
+	m_log->SetValue(wxString::FromAscii(m_logBuffer));
 	m_log->SetInsertionPoint(p - m_logBuffer - 1);
 }
 

Source/Core/DebuggerWX/src/RegisterView.cpp

@@ -39,10 +39,10 @@ CRegisterView::CRegisterView(wxWindow* parent, const wxWindowID id, const wxPoin
 	for (int i = 0; i < 16; i++)
 	{
 		// 0-15
-		int Item = InsertItem(0, GetGRPName(i));
+		int Item = InsertItem(0, wxString::FromAscii(GetGRPName(i)));
 
 		// 16-31
-		SetItem(Item, 2, GetGRPName(16 + i));
+		SetItem(Item, 2, wxString::FromAscii(GetGRPName(16 + i)));
 
 		// just for easy sort
 

Source/Core/DebuggerWX/src/SConscript

@@ -1,6 +1,9 @@
 Import('env')
 
 files = ["LogWindow.cpp", 
+         "BreakpointView.cpp",
+         "CodeView.cpp",
+         "BreakpointWindow.cpp",
          "CodeWindow.cpp",
          "CodeView.cpp",
          "Debugger.cpp", 

Source/Core/DiscIO/Src/Blob.cpp

@@ -1,10 +1,11 @@
 #ifdef WIN32
 #include <io.h>
 #include <windows.h>
+#else
+#include <unistd.h>
 #endif
 
 #include "stdafx.h"
-
 #include "../../../../Externals/zlib/zlib.h"
 
 #include "Blob.h"
@@ -103,7 +104,11 @@ class PlainFileReader
 		PlainFileReader(const char* filename)
 		{
 			file_ = fopen(filename, "rb");
-			fseek64(file_, 0, SEEK_END);
+			#if 0
+				fseek64(file_, 0, SEEK_END);
+			#else
+				fseek(file_, 0, SEEK_END); // I don't have fseek64 with gcc 4.3
+			#endif
 			size = ftell(file_);
 			fseek(file_, 0, SEEK_SET);
 		}

Source/Core/DiscIO/Src/SConscript

@@ -5,19 +5,12 @@ files = ["BannerLoader.cpp",
          "BannerLoaderWii.cpp",
          "Blob.cpp", 
          "FileHandlerARC.cpp",
-         "FileHandlerLZ77.cpp",
          "Filesystem.cpp",
          "FileSystemGCWii.cpp",
          "VolumeCreator.cpp",
          "VolumeGC.cpp",
          "VolumeWiiCrypted.cpp",
          "AES/aes_cbc.c",
-         "AES/aes_cfb.c",
          "AES/aes_core.c",
-         "AES/aes_ctr.c",
-         "AES/aes_ecb.c",
-         "AES/aes_ige.c",
-         "AES/aes_misc.c",
-         "AES/aes_ofb.c",
         ]
 env.StaticLibrary("discio", files, LIBS = ["common"])