From c8e246fbfeedbb6eb00cfaf3e6f661f95a0ed58e Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@a6443dda-0b58-4228-96e9-037be469359c>
Date: Sat, 20 Dec 2008 07:20:39 +0000
Subject: [PATCH] Fix everything else in Linux except for vtlb.cpp. Compilation
 is still broken, though.

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@464 a6443dda-0b58-4228-96e9-037be469359c
---
 pcsx2/DebugTools/DisR5900asm.c |  4 ++++
 pcsx2/InterTables.h            | 18 +++++++++---------
 pcsx2/Linux/DebugDlg.cpp       | 16 ++++++++++++++--
 pcsx2/SamplProf.h              |  5 ++---
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/pcsx2/DebugTools/DisR5900asm.c b/pcsx2/DebugTools/DisR5900asm.c
index 64e396820a..64ca42ee2a 100644
--- a/pcsx2/DebugTools/DisR5900asm.c
+++ b/pcsx2/DebugTools/DisR5900asm.c
@@ -19,6 +19,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef __LINUX__
+#include <cstdarg>
+#endif
+
 #include "Debug.h"
 #include "R5900.h"
 #include "DisASM.h"
diff --git a/pcsx2/InterTables.h b/pcsx2/InterTables.h
index 10207b6494..805bf025ba 100644
--- a/pcsx2/InterTables.h
+++ b/pcsx2/InterTables.h
@@ -22,15 +22,15 @@
 
 #include "PS2Etypes.h"
 
-#include "iR5900AritImm.h"
-#include "iR5900Arit.h"
-#include "iR5900MultDiv.h"
-#include "iR5900Shift.h"
-#include "iR5900Branch.h"
-#include "iR5900Jump.h"
-#include "iR5900LoadStore.h"
-#include "iR5900Move.h"
-#include "iMMI.h"
+#include "x86/iR5900AritImm.h"
+#include "x86/iR5900Arit.h"
+#include "x86/iR5900MultDiv.h"
+#include "x86/iR5900Shift.h"
+#include "x86/iR5900Branch.h"
+#include "x86/iR5900Jump.h"
+#include "x86/iR5900LoadStore.h"
+#include "x86/iR5900Move.h"
+#include "x86/iMMI.h"
 
 namespace EE { namespace Dynarec { namespace OpcodeImpl
 {
diff --git a/pcsx2/Linux/DebugDlg.cpp b/pcsx2/Linux/DebugDlg.cpp
index d77eac528c..e636f0ed7b 100644
--- a/pcsx2/Linux/DebugDlg.cpp
+++ b/pcsx2/Linux/DebugDlg.cpp
@@ -22,6 +22,8 @@ void UpdateDebugger() {
 
 	char *str;
 	int i;
+	std::string output;
+	
 	DebugAdj->value = (gfloat)dPC/4;
 	gtk_list_store_clear(ListDVModel);
 
@@ -40,7 +42,12 @@ void UpdateDebugger() {
 			str = nullAddr; 
 			}
 		else 
-			str = disR5900Fasm(*mem, pc);
+		{
+			std::string output;
+			
+			disR5900Fasm(output, *mem, pc);
+			output.copy( str, 256 );
+		}
 		gtk_list_store_append(ListDVModel, &iter);
 		gtk_list_store_set(ListDVModel, &iter, 0, str, -1);
 
@@ -176,7 +183,12 @@ void OnDumpC_Ok(GtkButton *button, gpointer user_data) {
 			str = nullAddr; 
 		}
 		else 
-			str = disR5900Fasm(*mem, addrf);
+		{
+			std::string output;
+			
+			disR5900Fasm(output, *mem, addrf);
+			output.copy( str, 256 );
+		}
 
 		fprintf(f, "%s\n", str);
 		addrf+= 4;
diff --git a/pcsx2/SamplProf.h b/pcsx2/SamplProf.h
index a65814c27c..e46b4f4eb2 100644
--- a/pcsx2/SamplProf.h
+++ b/pcsx2/SamplProf.h
@@ -6,7 +6,7 @@
 // The profiler does not have a Linux version yet.
 // So for now we turn it into duds for non-Win32 platforms.
 
-#if !defined( _DEBUG ) || !defined( WIN32 )
+#if !defined( _DEBUG ) && defined( WIN32 )
 
 void ProfilerInit();
 void ProfilerTerm();
@@ -16,7 +16,7 @@ void ProfilerRegisterSource(const char* Name,void* function);
 
 #else
 
-// Disables the profiler in Debug builds.
+// Disables the profiler in Debug & Linux builds.
 // Profiling info in debug builds isn't much use anyway and the console
 // popups are annoying when you're trying to trace debug logs and stuff.
 
@@ -24,7 +24,6 @@ void ProfilerRegisterSource(const char* Name,void* function);
 #define ProfilerTerm()
 #define ProfilerSetEnabled 0&&
 #define ProfilerRegisterSource 0&&
-#define ProfilerRegisterSource 0&&
 
 #endif