Fix a few compiler errors in Linux. I'm still trying to figure out the dependancy issues StringUtils is giving me, though, so doesn't compile in Linux right now...

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@568 a6443dda-0b58-4228-96e9-037be469359c

pcsx2/Console.cpp

@@ -19,7 +19,7 @@
 #include "PrecompiledHeader.h"
 
 #include "System.h"
-#include "Debug.h"
+#include "DebugTools/Debug.h"
 
 using namespace std;
 

pcsx2/DebugTools/Makefile.am

@@ -2,6 +2,6 @@ INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/
 noinst_LIBRARIES = libDebugTools.a
 
 libDebugTools_a_SOURCES = \
-cpuopsDebug.cpp  Debug.h.bak  DisR3000asm.cpp  DisVU0Micro.cpp  DisVUops.h \
-cpuopsDebug.h  DisASM.h     DisR5900asm.cpp  DisVU1Micro.cpp \
+Debug.h.bak  DisR3000asm.cpp  DisVU0Micro.cpp  DisVUops.h \
+DisASM.h     DisR5900asm.cpp  DisVU1Micro.cpp \
 Debug.h        DisR3000A.cpp  DisR5900.cpp     DisVUmicro.h

pcsx2/Makefile.am

@@ -10,14 +10,15 @@ CDVD.h        Elfheader.h    Memory.h        PsxCounters.h     R5900.h   VU0micr
 CDVDiso.cpp     FiFo.cpp         Misc.cpp          PsxDma.cpp          Sif.cpp     VU1micro.cpp \
 CDVDisodrv.cpp  FPU2.cpp       PsxDma.h          Sifcmd.h  VUflags.cpp \
 CDVDisodrv.h  FPU.cpp          MMI.cpp     MTGS.cpp      Sif.h     VUflags.h \
-CDVDiso.h     GS.cpp         PathUtils.cpp 	Patch.cpp         Sio.cpp     VU.h \
+CDVDiso.h     GS.cpp         PathUtils.cpp 	Patch.cpp         Sio.cpp    \
 CDVDlib.h     GS.h           Patch.h         PsxHw.cpp           Sio.h     VUmicro.h \
 Common.h      Hw.cpp           Plugins.cpp       PsxHw.h           SPR.cpp     VUops.cpp \
-COP0.cpp        Hw.h           Plugins.h       PsxInterpreter.cpp  SPR.h     VUops.h \
+COP0.cpp  COP2.cpp       Hw.h           Plugins.h       PsxInterpreter.cpp  SPR.h     VUops.h \
 COP0.h        Interpreter.cpp  PS2Edefs.h      PsxMem.cpp          System.h \
 Counters.cpp    InterTables.cpp  PS2Etypes.h     PsxMem.h          Vif.cpp \
 Counters.h    InterTables.h  PsxBios2.h      PsxSio2.cpp         VifDma.cpp \
 Decode_XA.cpp         PsxBios.cpp       PsxSio2.h         VifDma.h Cache.cpp vtlb.cpp \
-xmlpatchloader.cpp ThreadTools.cpp SourceLog.cpp SaveState.cpp System.cpp
+xmlpatchloader.cpp ThreadTools.cpp SourceLog.cpp SaveState.cpp System.cpp \
+Console.cpp vssprintf.cpp StringUtils.cpp
 
 SUBDIRS = x86 . DebugTools IPU RDebug tinyxml Linux

pcsx2/Memory.cpp

@@ -2771,7 +2771,7 @@ void memReset()
 	long filesize;
 	if( ( filesize = Path::getFileSize( Bios ) ) <= 0 )
 	{
-		Console::Error(_("Unable to load bios: '%s', PCSX2 can't run without that"), params Bios);
+		Console::Error("Unable to load bios: '%s', PCSX2 can't run without that", params Bios);
 		throw Exception::FileNotFound( Bios,
 			"The specified Bios file was not found.  A bios is required for Pcsx2 to run.\n\nFile not found" );
 	}
@@ -2952,7 +2952,7 @@ __forceinline void __fastcall SysPageFaultExceptionFilter( int signal, siginfo_t
 	}
 
 	err = mprotect( &psM[pageoffset], pagesize, PROT_READ | PROT_WRITE );
-	if (err) DevCon::Error("SysPageFaultExceptionFilter: %s", strerror(errno));
+	if (err) DevCon::Error("SysPageFaultExceptionFilter: %s", params strerror(errno));
 	
 	offset>>=12;
 	psMPWC[(offset/32)]|=(1<<(offset&31));

pcsx2/PathUtils.cpp

@@ -19,6 +19,16 @@
 #include "PrecompiledHeader.h"
 #include "Common.h"
 
+#ifdef __LINUX__
+#ifndef _S_IFDIR
+#define _S_IFDIR S_IFDIR
+#endif
+
+#ifndef _S_IFREG
+#define _S_IFREG S_IFREG
+#endif
+#endif
+
 namespace Path
 {
 
@@ -70,7 +80,7 @@ bool isRooted( const string& path )
 #ifdef WIN32
 	return (path[0] == '/') || (path[0] == '\\') || (path[1] == ':');
 #else
-	return (path[0] == PathSeparator);
+	return (path[0] == Separator);
 #endif
 }
 

pcsx2/System.cpp

@@ -31,7 +31,7 @@ bool sysInitialized = false;
 
 namespace Exception
 {
-	BaseException::~BaseException() {}
+	BaseException::~BaseException() throw() {}
 }
 
 // I can't believe I had to make my own version of trim.  C++'s STL is totally whack.

pcsx2/vssprintf.cpp

@@ -51,6 +51,10 @@
 
 #define is_digit(c) ((c) >= '0' && (c) <= '9')
 
+#ifdef __LINUX__
+#define _CVTBUFSIZE (309+40)
+#endif
+
 static const char *digits = "0123456789abcdefghijklmnopqrstuvwxyz";
 static const char *upper_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 

pcsx2/x86/Makefile.am

@@ -5,7 +5,8 @@ noinst_LIBRARIES = libx86recomp.a
 
 archfiles = ix86-32/iR5900-32.cpp   ix86-32/iR5900AritImm.cpp  ix86-32/iR5900Jump.cpp \
 ix86-32/iR5900Move.cpp ix86-32/iR5900Shift.cpp ix86-32/iR5900Arit.cpp  ix86-32/iR5900Branch.cpp \
-ix86-32/iR5900LoadStore.cpp  ix86-32/iR5900MultDiv.cpp ix86-32/iCore-32.cpp ix86-32/aR5900-32.S
+ix86-32/iR5900LoadStore.cpp  ix86-32/iR5900MultDiv.cpp ix86-32/iCore-32.cpp ix86-32/aR5900-32.S 
+#ix86-32/iR5900Templates.cpp
 
 libx86recomp_a_SOURCES = iCOP2.cpp  iCP0.cpp  iFPU.cpp  iHw.cpp  iMMI.cpp  iPsxHw.cpp  iPsxMem.cpp  \
 ir5900tables.cpp  iVU0micro.cpp  iVU1micro.cpp  iVUmicro.cpp iVUmicroUpper.cpp iVUmicroLower.cpp \
@@ -14,4 +15,4 @@ fast_routines.S aR3000A.S aVUzerorec.S aVif.S $(archfiles)
 
 libx86recomp_a_DEPENDENCIES = ix86/libix86.a
 
-SUBDIRS = ix86
+SUBDIRS = ix86

pcsx2/x86/ix86/Makefile.am

@@ -1,5 +1,5 @@
 INCLUDES = -I@srcdir@/.. -I@srcdir@/../../   -I@srcdir@/../../../common/
 noinst_LIBRARIES = libix86.a
 
-libix86_a_SOURCES = ix86_3dnow.cpp  ix86.cpp  ix86_cpudetect.cpp  ix86_fpu.cpp  ix86.h ix86_sse.cpp ix86_mmx.cpp
+libix86_a_SOURCES = ix86_tools.cpp ix86_3dnow.cpp  ix86.cpp  ix86_cpudetect.cpp  ix86_fpu.cpp  ix86.h ix86_sse.cpp ix86_mmx.cpp
 

pcsx2/x86/ix86/ix86_tools.cpp

@@ -230,6 +230,7 @@ __forceinline void FreezeXMMRegs_(int save)
 }
 
 #ifdef PCSX2_DEVBUILD
+#ifdef _WIN32
 __declspec(naked) void _StartPerfCounter()
 {
 	__asm {
@@ -270,5 +271,5 @@ __declspec(naked) void _StopPerfCounter()
 		ret
 	}
 }
-
+#endif // WIN32
 #endif // PCSX2_DEVBUILD