MaddTheSane:

- Clean up the Xcode projects a bit.
- Added 64-bit mode on Mac.
- Made it so that the SDK was set on the Xcode projects.
- Enabled PowerPC support.
(Patch #7730).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61171 e17a0e51-4ae3-4d35-97c3-1a29b211df97

26 files changed, 323 insertions, 250 deletions

diff --git a/libpcsxcore/ix86/iR3000A.c b/libpcsxcore/ix86/iR3000A.c
index 203c6c0e..a6e38978 100644
--- a/libpcsxcore/ix86/iR3000A.c
+++ b/libpcsxcore/ix86/iR3000A.c
@@ -21,6 +21,8 @@
 * i386 assembly functions for R3000A core.
 */
 
+#ifdef __i386__
+
 #include "ix86.h"
 #include <sys/mman.h>
 
@@ -73,8 +75,8 @@ static void (*recSPC[64])();
 static void (*recREG[32])();
 static void (*recCP0[32])();
 static void (*recCP2[64])();
-static void (*recCP2BSC[32])();

-

+static void (*recCP2BSC[32])();
+
 #define DYNAREC_BLOCK 50
 
 static void MapConst(int reg, u32 _const) {
@@ -163,23 +165,23 @@ static void SetBranch() {
 		return;
 	}
 
-	

-	switch( psxRegs.code >> 26 ) {

-		// Lode Runner (jr - beq)

-

-		// bltz - bgez - bltzal - bgezal / beq - bne - blez - bgtz

-		case 0x01:

-		case 0x04:

-		case 0x05:

-		case 0x06:

-		case 0x07:

-			break;

-

-		default:

-			recBSC[psxRegs.code>>26]();

-			break;

-	}

-

+	
+	switch( psxRegs.code >> 26 ) {
+		// Lode Runner (jr - beq)
+
+		// bltz - bgez - bltzal - bgezal / beq - bne - blez - bgtz
+		case 0x01:
+		case 0x04:
+		case 0x05:
+		case 0x06:
+		case 0x07:
+			break;
+
+		default:
+			recBSC[psxRegs.code>>26]();
+			break;
+	}
+
 
 	iFlushRegs();
 	MOV32MtoR(EAX, (u32)&target);
@@ -469,24 +471,24 @@ static void recExecuteBlock() {
 }
 
 static void recClear(u32 Addr, u32 Size) {
-	u32 bank,offset;

-

-	bank = Addr >> 24;

-	offset = Addr & 0xffffff;

-

-

-	// Pitfall 3D - clear dynarec slots that contain 'stale' ram data

-	// - fixes stage 1 loading crash

-	if( bank == 0x80 || bank == 0xa0 || bank == 0x00 ) {

-		offset &= 0x1fffff;

-

-		if( offset >= DYNAREC_BLOCK * 4 )

-			memset((void*)PC_REC(Addr - DYNAREC_BLOCK * 4), 0, DYNAREC_BLOCK * 4);

-		else

-			memset((void*)PC_REC(Addr - offset), 0, offset);

-	}

-	

-	

+	u32 bank,offset;
+
+	bank = Addr >> 24;
+	offset = Addr & 0xffffff;
+
+
+	// Pitfall 3D - clear dynarec slots that contain 'stale' ram data
+	// - fixes stage 1 loading crash
+	if( bank == 0x80 || bank == 0xa0 || bank == 0x00 ) {
+		offset &= 0x1fffff;
+
+		if( offset >= DYNAREC_BLOCK * 4 )
+			memset((void*)PC_REC(Addr - DYNAREC_BLOCK * 4), 0, DYNAREC_BLOCK * 4);
+		else
+			memset((void*)PC_REC(Addr - offset), 0, offset);
+	}
+	
+	
 	memset((void*)PC_REC(Addr), 0, Size * 4);
 }
 
@@ -513,13 +515,13 @@ static void recCOP0() {
 }
 
 //REC_SYS(COP2);
-static void recCOP2() {

-	MOV32MtoR(EAX, (u32)&psxRegs.CP0.n.Status);

-	AND32ItoR(EAX, 0x40000000);

-	j8Ptr[31] = JZ8(0);

+static void recCOP2() {
+	MOV32MtoR(EAX, (u32)&psxRegs.CP0.n.Status);
+	AND32ItoR(EAX, 0x40000000);
+	j8Ptr[31] = JZ8(0);
+
+	recCP2[_Funct_]();
 
-	recCP2[_Funct_]();

-

 	x86SetJ8(j8Ptr[31]);
 }
 
@@ -1791,8 +1793,8 @@ static void recSB() {
 	if (IsConst(_Rs_)) {
 		u32 addr = iRegs[_Rs_].k + _Imm_;
 		int t = addr >> 16;
-

-#if 0

+
+#if 0
 		// V-Rally 2 - no tree sprite corruption
 		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
 			if (IsConst(_Rt_)) {
@@ -1802,7 +1804,7 @@ static void recSB() {
 				MOV8RtoM((u32)&psxM[addr & 0x1fffff], EAX);
 			}
 			return;
-		}

+		}
 #endif
 		if (t == 0x1f80 && addr < 0x1f801000) {
 			if (IsConst(_Rt_)) {
@@ -1836,8 +1838,8 @@ static void recSH() {
 		u32 addr = iRegs[_Rs_].k + _Imm_;
 		int t = addr >> 16;
 
-#if 0

-		// V-Rally 2 - no tree sprite corruption

+#if 0
+		// V-Rally 2 - no tree sprite corruption
 		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
 			if (IsConst(_Rt_)) {
 				MOV16ItoM((u32)&psxM[addr & 0x1fffff], (u16)iRegs[_Rt_].k);
@@ -1846,7 +1848,7 @@ static void recSH() {
 				MOV16RtoM((u32)&psxM[addr & 0x1fffff], EAX);
 			}
 			return;
-		}

+		}
 #endif
 		if (t == 0x1f80 && addr < 0x1f801000) {
 			if (IsConst(_Rt_)) {
@@ -1895,8 +1897,8 @@ static void recSW() {
 		u32 addr = iRegs[_Rs_].k + _Imm_;
 		int t = addr >> 16;
 
-#if 0

-		// V-Rally 2 - no tree sprite corruption

+#if 0
+		// V-Rally 2 - no tree sprite corruption
 		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
 			if (IsConst(_Rt_)) {
 				MOV32ItoM((u32)&psxM[addr & 0x1fffff], iRegs[_Rt_].k);
@@ -1905,7 +1907,7 @@ static void recSW() {
 				MOV32RtoM((u32)&psxM[addr & 0x1fffff], EAX);
 			}
 			return;
-		}

+		}
 #endif
 		if (t == 0x1f80 && addr < 0x1f801000) {
 			if (IsConst(_Rt_)) {
@@ -1956,7 +1958,7 @@ static void recSW() {
 					CALL32M((u32)&GPU_writeStatus);
 #ifndef __WIN32__
 					resp+= 4;
-#endif

+#endif
 					return;
 			}
 		}
@@ -2063,14 +2065,14 @@ void recSWL() {
 	if (IsConst(_Rs_)) {
 		u32 addr = iRegs[_Rs_].k + _Imm_;
 		int t = addr >> 16;
-

+
 #if 0
 		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
 			MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
 			iSWLk(addr & 3);
 			MOV32RtoM((u32)&psxM[addr & 0x1ffffc], EAX);
 			return;
-		}

+		}
 #endif
 		if (t == 0x1f80 && addr < 0x1f801000) {
 			MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
@@ -2145,14 +2147,14 @@ void recSWR() {
 	if (IsConst(_Rs_)) {
 		u32 addr = iRegs[_Rs_].k + _Imm_;
 		int t = addr >> 16;
-

+
 #if 0
 		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
 			MOV32MtoR(EAX, (u32)&psxM[addr & 0x1ffffc]);
 			iSWRk(addr & 3);
 			MOV32RtoM((u32)&psxM[addr & 0x1ffffc], EAX);
 			return;
-		}

+		}
 #endif
 		if (t == 0x1f80 && addr < 0x1f801000) {
 			MOV32MtoR(EAX, (u32)&psxH[addr & 0xffc]);
@@ -2997,3 +2999,5 @@ R3000Acpu psxRec = {
 	recClear,
 	recShutdown
 };
+
+#endif
diff --git a/libpcsxcore/ix86/ix86.c b/libpcsxcore/ix86/ix86.c
index d701e899..1525ac37 100644
--- a/libpcsxcore/ix86/ix86.c
+++ b/libpcsxcore/ix86/ix86.c
@@ -23,6 +23,8 @@
  *           alexey silinov
  */
 
+#ifdef __i386__
+
 #include "ix86.h"
 
 s8  *x86Ptr;
@@ -1721,3 +1723,5 @@ void PFMINRtoR(int to, int from) {
 	ModRM(3, to, from);
 	write8(0x94);
 }
+
+#endif
diff --git a/libpcsxcore/ix86_64/iR3000A-64.c b/libpcsxcore/ix86_64/iR3000A-64.c
index 12004e82..85737046 100644
--- a/libpcsxcore/ix86_64/iR3000A-64.c
+++ b/libpcsxcore/ix86_64/iR3000A-64.c
@@ -21,6 +21,8 @@
 * i386 assembly functions for R3000A core.
 */
 
+#ifdef __x86_64__
+
 #include "ix86-64.h"
 #include "../r3000a.h"
 #include "../psxhle.h"
@@ -521,12 +523,12 @@ static void recCOP0() {
 //REC_SYS(COP2);
 #if 1
 static void recCOP2() {
-	MOV32MtoR(EAX, (uptr)&psxRegs.CP0.n.Status);

-	AND32ItoR(EAX, 0x40000000);

-	j8Ptr[31] = JZ8(0);

-

-	recCP2[_Funct_]();

-

+	MOV32MtoR(EAX, (uptr)&psxRegs.CP0.n.Status);
+	AND32ItoR(EAX, 0x40000000);
+	j8Ptr[31] = JZ8(0);
+
+	recCP2[_Funct_]();
+
 	x86SetJ8(j8Ptr[31]);
 }
 #endif
@@ -3009,3 +3011,4 @@ R3000Acpu psxRec = {
 	recClear,
 	recShutdown
 };
+#endif
diff --git a/libpcsxcore/ix86_64/ix86-64.c b/libpcsxcore/ix86_64/ix86-64.c
index 0582f351..582b3a40 100644
--- a/libpcsxcore/ix86_64/ix86-64.c
+++ b/libpcsxcore/ix86_64/ix86-64.c
@@ -6,6 +6,8 @@
  *			 zerofrog(@gmail.com)
  */
 
+#ifdef __x86_64__
+
 // stop compiling if NORECBUILD build (only for Visual Studio)
 #if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
 
@@ -3137,3 +3139,5 @@ void LEA32RStoR(x86IntRegType to, x86IntRegType from, u32 scale)
 }
 
 #endif
+
+#endif
diff --git a/libpcsxcore/ix86_64/ix86_cpudetect.c b/libpcsxcore/ix86_64/ix86_cpudetect.c
index 3c014d89..664e6b7d 100644
--- a/libpcsxcore/ix86_64/ix86_cpudetect.c
+++ b/libpcsxcore/ix86_64/ix86_cpudetect.c
@@ -15,6 +15,9 @@
  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA

  */

+

+#ifdef __x86_64__

+

 #if defined (_WIN32)

 #include <windows.h>

 #endif

@@ -142,7 +145,7 @@ u64 GetCPUTick( void )
 #endif

 }

 

-#if defined __LINUX__

+#if defined(__LINUX__) || defined(__APPLE__)

 

 #include <sys/time.h>

 #include <errno.h>

@@ -485,3 +488,5 @@ void cpudetectInit( void )
    cpucaps.has3DNOWInstructionExtensions                = ( cpuinfo.x86EFlags >> 31 ) & 1; //3dnow   

    cpuinfo.cpuspeed = (u32 )(CPUSpeedHz( 1000 ) / 1000000);

 }

+

+#endif

diff --git a/libpcsxcore/ix86_64/ix86_fpu.c b/libpcsxcore/ix86_64/ix86_fpu.c
index ca49eb7c..cd58698b 100644
--- a/libpcsxcore/ix86_64/ix86_fpu.c
+++ b/libpcsxcore/ix86_64/ix86_fpu.c
@@ -1,4 +1,7 @@
 // stop compiling if NORECBUILD build (only for Visual Studio)
+
+#ifdef __x86_64__
+
 #if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
 
 #include <stdio.h>
@@ -246,3 +249,5 @@ void FCMOVNBE32( x86IntRegType from )   { FCMOV32( 0xDB, 0xD0 ); }
 void FCMOVNU32( x86IntRegType from )    { FCMOV32( 0xDB, 0xD8 ); }
 
 #endif
+
+#endif
diff --git a/libpcsxcore/ix86_64/ix86_mmx.c b/libpcsxcore/ix86_64/ix86_mmx.c
index eddbbfcc..09784a9c 100644
--- a/libpcsxcore/ix86_64/ix86_mmx.c
+++ b/libpcsxcore/ix86_64/ix86_mmx.c
@@ -1,4 +1,7 @@
 // stop compiling if NORECBUILD build (only for Visual Studio)
+
+#ifdef __x86_64__
+
 #if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
 
 #include "ix86-64.h"
@@ -644,3 +647,5 @@ void MASKMOVQRtoR(x86MMXRegType to, x86MMXRegType from)
 }
 
 #endif
+
+#endif
diff --git a/libpcsxcore/ix86_64/ix86_sse.c b/libpcsxcore/ix86_64/ix86_sse.c
index cb391dca..8a4f0217 100644
--- a/libpcsxcore/ix86_64/ix86_sse.c
+++ b/libpcsxcore/ix86_64/ix86_sse.c
@@ -1,4 +1,7 @@
 // stop compiling if NORECBUILD build (only for Visual Studio)
+
+#ifdef __x86_64__
+
 #if !(defined(_MSC_VER) && defined(PCSX2_NORECBUILD))
 
 #include <assert.h>
@@ -1453,3 +1456,5 @@ void SSE2EMU_MOVD_R_to_XMM( x86SSERegType to, x86IntRegType from ) {
 }
 
 #endif
+
+#endif
diff --git a/libpcsxcore/ppc/pR3000A.c b/libpcsxcore/ppc/pR3000A.c
index 93745f82..c3aea8f2 100644
--- a/libpcsxcore/ppc/pR3000A.c
+++ b/libpcsxcore/ppc/pR3000A.c
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
  */
 
+#if defined (__ppc__) || defined (__ppc64__)
+
 #ifdef _MSC_VER_
 #pragma warning(disable:4244)
 #pragma warning(disable:4761)
@@ -3538,3 +3540,4 @@ R3000Acpu psxRec = {
 	recShutdown
 };
 
+#endif
diff --git a/libpcsxcore/ppc/pasm.s b/libpcsxcore/ppc/pasm.s
index 96891b42..ae1558dd 100644
--- a/libpcsxcore/ppc/pasm.s
+++ b/libpcsxcore/ppc/pasm.s
@@ -1,4 +1,11 @@
 
+#if defined (__ppc__) || defined (__ppc64__)
+
+#ifdef ELF
+#define C(label) label
+#else
+#define C(label) _##label
+#endif
 
 #define OLD_REGISTER_OFFSET	(19*4)
 #define SP_SIZE			(OLD_REGISTER_OFFSET+4+8)
@@ -6,8 +13,8 @@
 /*asm void recRun(register void (*func)(), register u32 hw1, register u32 hw2)*/
         .text
         .align  4
-        .globl  recRun
-recRun:
+        .globl  C(recRun)
+C(recRun):
 	/* prologue code */
 	mflr	r0
 	stmw	r13, -(32-13)*4(r1)
@@ -25,8 +32,8 @@ asm void returnPC()
 {*/
         .text
         .align  4
-        .globl  returnPC
-returnPC:
+        .globl  C(returnPC)
+C(returnPC):
 	// end code
 	lwz		r0, (32-13)*4+8+4(r1)
 	addi	r1, r1, (32-13)*4+8
@@ -39,15 +46,15 @@ returnPC:
 
         .text
         .align  4
-        .globl  dynMemRead8
-dynMemRead8:
+        .globl  C(dynMemRead8)
+C(dynMemRead8):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.     r4,r2,16
 	bne+     .norm8
 	cmplwi   r2,0x1000
 	blt-     .norm8
-	b        psxHwRead8
+	b        C(psxHwRead8)
 .norm8:
 	clrlwi   r5,r3,3
 	lbzx     r3,r5,r30
@@ -55,15 +62,15 @@ dynMemRead8:
 
         .text
         .align  4
-        .globl  dynMemRead16
-dynMemRead16:
+        .globl  C(dynMemRead16)
+C(dynMemRead16):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.     r4,r2,16
 	bne+     .norm16
 	cmplwi   r2,0x1000
 	blt-     .norm16
-	b        psxHwRead16
+	b        C(psxHwRead16)
 .norm16:
 	clrlwi   r5,r3,3
 	lhbrx    r3,r5,r30
@@ -71,15 +78,15 @@ dynMemRead16:
 
         .text
         .align  4
-        .globl  dynMemRead32
-dynMemRead32:
+        .globl  C(dynMemRead32)
+C(dynMemRead32):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.     r4,r2,16
 	bne+     .norm32
 	cmplwi   r2,0x1000
 	blt-     .norm32
-	b        psxHwRead32
+	b        C(psxHwRead32)
 .norm32:
 	clrlwi   r5,r3,3
 	lwbrx    r3,r5,r30
@@ -98,15 +105,15 @@ P | !(N | !Z)
 
         .text
         .align  4
-        .globl  dynMemWrite32
-dynMemWrite32:
+        .globl  C(dynMemWrite32)
+C(dynMemWrite32):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.    r5,r2,16
 	bne+     .normw32
 	cmplwi   r2,0x1000
 	blt      .normw32
-	b        psxHwWrite32
+	b        C(psxHwWrite32)
 .normw32:
 	mtcrf    0xFF, r3
 	clrlwi   r5,r3,3
@@ -122,3 +129,4 @@ dynMemWrite32:
 	stwbrx   r4,r5,r30
 	blr
 
+#endif
diff --git a/libpcsxcore/ppc/ppc.c b/libpcsxcore/ppc/ppc.c
index efaf8b6d..84ec75ea 100644
--- a/libpcsxcore/ppc/ppc.c
+++ b/libpcsxcore/ppc/ppc.c
@@ -4,6 +4,8 @@
  *           alexey silinov
  */
 
+#if defined (__ppc__) || defined (__ppc64__)
+
 #include <stdio.h>
 #include <string.h>
 
@@ -30,3 +32,4 @@ void ppcAlign(int bytes) {
 void ppcShutdown() {
 }
 
+#endif
diff --git a/libpcsxcore/ppc/reguse.c b/libpcsxcore/ppc/reguse.c
index 47d70a54..f68e48a4 100644
--- a/libpcsxcore/ppc/reguse.c
+++ b/libpcsxcore/ppc/reguse.c
@@ -1,4 +1,6 @@
 
+#if defined (__ppc__) || defined (__ppc64__)
+
 #include "../psxcommon.h"
 #include "reguse.h"
 
@@ -417,3 +419,5 @@ int isPsxRegUsed(u32 pc, int psxreg)
     else
         return 0; // the next use is a write, i.e. current value is not important
 }
+
+#endif
diff --git a/macosx/Info.plist b/macosx/Info.plist
index ff280c9e..5f732354 100644
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -82,7 +82,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>PCSX</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string>PCSX.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -100,7 +100,7 @@
 	<key>CFBundleVersion</key>
 	<string>SVN</string>
 	<key>NSMainNibFile</key>
-	<string>PCSX.nib</string>
+	<string>PCSX</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>
diff --git a/macosx/Pcsx.xcodeproj/project.pbxproj b/macosx/Pcsx.xcodeproj/project.pbxproj
index 692f1b9a..3c11e138 100644
--- a/macosx/Pcsx.xcodeproj/project.pbxproj
+++ b/macosx/Pcsx.xcodeproj/project.pbxproj
@@ -12,17 +12,10 @@
 		2B143D08078A2CBD00AF745A /* pcsxmemcard.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */; };
 		2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D04078A2CBD00AF745A /* psxbios.icns */; };
 		2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D05078A2CBD00AF745A /* psxplugin.icns */; };
-		2B3E356C06937D1C00763C7D /* PcsxPluginDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */; };
 		2B3E356D06937D1C00763C7D /* PcsxPluginDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */; };
 		2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */; };
 		2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B02C04304E145D000880C5B /* Carbon.framework */; };
-		2B4DE99105FF9307003EFEF0 /* PluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B4DE98D05FF9307003EFEF0 /* PluginController.h */; };
 		2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B4DE98E05FF9307003EFEF0 /* PluginController.m */; };
-		2BB3D69D05427FE200831ACB /* PcsxController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B75FD3C051C56D200D12034 /* PcsxController.h */; };
-		2BB3D69E05427FE200831ACB /* ConfigurationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B75FD4A051C8A7400D12034 /* ConfigurationController.h */; };
-		2BB3D69F05427FE200831ACB /* PluginList.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BBB1126051DC00500B84448 /* PluginList.h */; };
-		2BB3D6A005427FE200831ACB /* EmuThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BBB1791051E113B00B84448 /* EmuThread.h */; };
-		2BB3D6A105427FE200831ACB /* PcsxPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */; };
 		2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B00514CE260026D74D /* Configuration.nib */; };
 		2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B20514CE260026D74D /* InfoPlist.strings */; };
 		2BB3D6A505427FE200831ACB /* PCSX.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B40514CE260026D74D /* PCSX.nib */; };
@@ -37,67 +30,46 @@
 		2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BC4786204C7FD3600CAB520 /* Cocoa.framework */; };
 		2BB3D6C705427FE200831ACB /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AAE04C832040017A3B1 /* System.framework */; };
 		2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */; };
+		556A148312B6DE1A007DE998 /* pasm.s in Sources */ = {isa = PBXBuildFile; fileRef = 556A147B12B6DE1A007DE998 /* pasm.s */; };
+		556A148412B6DE1A007DE998 /* ppc.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A147D12B6DE1A007DE998 /* ppc.c */; };
+		556A148512B6DE1A007DE998 /* pR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A148012B6DE1A007DE998 /* pR3000A.c */; };
+		556A148612B6DE1A007DE998 /* reguse.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A148112B6DE1A007DE998 /* reguse.c */; };
+		559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C112B694DF004ACC1E /* iR3000A-64.c */; };
+		559366CB12B694DF004ACC1E /* ix86-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C212B694DF004ACC1E /* ix86-64.c */; };
+		559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C512B694DF004ACC1E /* ix86_cpudetect.c */; };
+		559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C612B694DF004ACC1E /* ix86_fpu.c */; };
+		559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C712B694DF004ACC1E /* ix86_mmx.c */; };
+		559366D012B694DF004ACC1E /* ix86_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C812B694DF004ACC1E /* ix86_sse.c */; };
 		712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
 		712FD1E91093096F00575A92 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E61093096F00575A92 /* socket.c */; };
-		712FD1EA1093096F00575A92 /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 712FD1E71093096F00575A92 /* socket.h */; };
 		713B530E110B75650002F164 /* ppf.c in Sources */ = {isa = PBXBuildFile; fileRef = 713B530C110B75650002F164 /* ppf.c */; };
-		713B530F110B75650002F164 /* ppf.h in Headers */ = {isa = PBXBuildFile; fileRef = 713B530D110B75650002F164 /* ppf.h */; };
 		713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */; };
-		7161C2820FDED6D000225F97 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 7161C2810FDED6D000225F97 /* config.h */; };
-		7161C2980FDED75300225F97 /* ExtendedKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 7161C2970FDED75300225F97 /* ExtendedKeys.h */; };
 		7192F42A129C412E0042D946 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 7192F428129C412E0042D946 /* gpu.c */; };
-		7192F42B129C412E0042D946 /* gpu.h in Headers */ = {isa = PBXBuildFile; fileRef = 7192F429129C412E0042D946 /* gpu.h */; };
-		719594B111AEFE8C004AD686 /* gte_divider.h in Headers */ = {isa = PBXBuildFile; fileRef = 719594AF11AEFE8C004AD686 /* gte_divider.h */; };
 		719594B211AEFE8C004AD686 /* psxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 719594B011AEFE8C004AD686 /* psxcommon.c */; };
 		71AD2DF410C3575300365243 /* PeopsSPU.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */; };
 		71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */; };
 		71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F2C0861200B69B00322AD9 /* DFInput.psxplugin */; };
 		71F4C5890FDED12800529849 /* cdriso.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5600FDED12800529849 /* cdriso.c */; };
-		71F4C58A0FDED12800529849 /* cdriso.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5610FDED12800529849 /* cdriso.h */; };
 		71F4C58B0FDED12800529849 /* cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5620FDED12800529849 /* cdrom.c */; };
-		71F4C58C0FDED12800529849 /* cdrom.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5630FDED12800529849 /* cdrom.h */; };
 		71F4C58D0FDED12800529849 /* cheat.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5640FDED12800529849 /* cheat.c */; };
-		71F4C58E0FDED12800529849 /* cheat.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5650FDED12800529849 /* cheat.h */; };
-		71F4C58F0FDED12800529849 /* coff.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5660FDED12800529849 /* coff.h */; };
-		71F4C5900FDED12800529849 /* debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5670FDED12800529849 /* debug.h */; };
 		71F4C5910FDED12800529849 /* decode_xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5680FDED12800529849 /* decode_xa.c */; };
-		71F4C5920FDED12800529849 /* decode_xa.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5690FDED12800529849 /* decode_xa.h */; };
 		71F4C5930FDED12800529849 /* disr3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56A0FDED12800529849 /* disr3000a.c */; };
 		71F4C5940FDED12800529849 /* gte.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56B0FDED12800529849 /* gte.c */; };
-		71F4C5950FDED12800529849 /* gte.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C56C0FDED12800529849 /* gte.h */; };
 		71F4C5960FDED12800529849 /* mdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56D0FDED12800529849 /* mdec.c */; };
-		71F4C5970FDED12800529849 /* mdec.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C56E0FDED12800529849 /* mdec.h */; };
 		71F4C5980FDED12800529849 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56F0FDED12800529849 /* misc.c */; };
-		71F4C5990FDED12800529849 /* misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5700FDED12800529849 /* misc.h */; };
 		71F4C59A0FDED12800529849 /* plugins.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5710FDED12800529849 /* plugins.c */; };
-		71F4C59B0FDED12800529849 /* plugins.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5720FDED12800529849 /* plugins.h */; };
-		71F4C59C0FDED12800529849 /* psemu_plugin_defs.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5730FDED12800529849 /* psemu_plugin_defs.h */; };
 		71F4C59D0FDED12800529849 /* psxbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5740FDED12800529849 /* psxbios.c */; };
-		71F4C59E0FDED12800529849 /* psxbios.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5750FDED12800529849 /* psxbios.h */; };
-		71F4C59F0FDED12800529849 /* psxcommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5760FDED12800529849 /* psxcommon.h */; };
 		71F4C5A00FDED12800529849 /* psxcounters.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5770FDED12800529849 /* psxcounters.c */; };
-		71F4C5A10FDED12800529849 /* psxcounters.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5780FDED12800529849 /* psxcounters.h */; };
 		71F4C5A20FDED12800529849 /* psxdma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5790FDED12800529849 /* psxdma.c */; };
-		71F4C5A30FDED12800529849 /* psxdma.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C57A0FDED12800529849 /* psxdma.h */; };
 		71F4C5A40FDED12800529849 /* psxhle.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57B0FDED12800529849 /* psxhle.c */; };
-		71F4C5A50FDED12800529849 /* psxhle.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C57C0FDED12800529849 /* psxhle.h */; };
 		71F4C5A60FDED12800529849 /* psxhw.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57D0FDED12800529849 /* psxhw.c */; };
-		71F4C5A70FDED12800529849 /* psxhw.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C57E0FDED12800529849 /* psxhw.h */; };
 		71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57F0FDED12800529849 /* psxinterpreter.c */; };
 		71F4C5A90FDED12800529849 /* psxmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5800FDED12800529849 /* psxmem.c */; };
-		71F4C5AA0FDED12800529849 /* psxmem.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5810FDED12800529849 /* psxmem.h */; };
 		71F4C5AB0FDED12800529849 /* r3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5820FDED12800529849 /* r3000a.c */; };
-		71F4C5AC0FDED12800529849 /* r3000a.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5830FDED12800529849 /* r3000a.h */; };
 		71F4C5AD0FDED12800529849 /* sio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5840FDED12800529849 /* sio.c */; };
-		71F4C5AE0FDED12800529849 /* sio.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5850FDED12800529849 /* sio.h */; };
 		71F4C5AF0FDED12800529849 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5860FDED12800529849 /* spu.c */; };
-		71F4C5B00FDED12800529849 /* spu.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5870FDED12800529849 /* spu.h */; };
-		71F4C5B10FDED12800529849 /* system.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5880FDED12800529849 /* system.h */; };
-		71F4C5B80FDED16D00529849 /* iGte.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5B40FDED16D00529849 /* iGte.h */; };
 		71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B50FDED16D00529849 /* iR3000A.c */; };
 		71F4C5BA0FDED16D00529849 /* ix86.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B60FDED16D00529849 /* ix86.c */; };
-		71F4C5BB0FDED16D00529849 /* ix86.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5B70FDED16D00529849 /* ix86.h */; };
-		71F703A711B3A673007DD5C5 /* sjisfont.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F703A611B3A673007DD5C5 /* sjisfont.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
@@ -122,23 +94,6 @@
 		};
 /* End PBXBuildRule section */
 
-/* Begin PBXBuildStyle section */
-		7192F3FF129C410B0042D946 /* Development */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-			};
-			name = Development;
-		};
-		7192F400129C410B0042D946 /* Deployment */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-			};
-			name = Deployment;
-		};
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
 		713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -242,7 +197,7 @@
 		2BA178B50514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PCSX.nib; sourceTree = "<group>"; };
 		2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPlugin.h; sourceTree = "<group>"; };
 		2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
-		2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+		2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; };
 		2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; };
@@ -251,6 +206,24 @@
 		2BBB1792051E113B00B84448 /* EmuThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmuThread.m; sourceTree = "<group>"; };
 		2BBB17DA051E4D0F00B84448 /* Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Plugin.c; sourceTree = SOURCE_ROOT; };
 		2BC4786204C7FD3600CAB520 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		556A147B12B6DE1A007DE998 /* pasm.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = pasm.s; sourceTree = "<group>"; };
+		556A147C12B6DE1A007DE998 /* pGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pGte.h; sourceTree = "<group>"; };
+		556A147D12B6DE1A007DE998 /* ppc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ppc.c; sourceTree = "<group>"; };
+		556A147E12B6DE1A007DE998 /* ppc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ppc.h; sourceTree = "<group>"; };
+		556A147F12B6DE1A007DE998 /* ppc_mnemonics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ppc_mnemonics.h; sourceTree = "<group>"; };
+		556A148012B6DE1A007DE998 /* pR3000A.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pR3000A.c; sourceTree = "<group>"; };
+		556A148112B6DE1A007DE998 /* reguse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reguse.c; sourceTree = "<group>"; };
+		556A148212B6DE1A007DE998 /* reguse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reguse.h; sourceTree = "<group>"; };
+		559366C012B694DF004ACC1E /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; };
+		559366C112B694DF004ACC1E /* iR3000A-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "iR3000A-64.c"; sourceTree = "<group>"; };
+		559366C212B694DF004ACC1E /* ix86-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ix86-64.c"; sourceTree = "<group>"; };
+		559366C312B694DF004ACC1E /* ix86-64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ix86-64.h"; sourceTree = "<group>"; };
+		559366C412B694DF004ACC1E /* ix86_3dnow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_3dnow.c; sourceTree = "<group>"; };
+		559366C512B694DF004ACC1E /* ix86_cpudetect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_cpudetect.c; sourceTree = "<group>"; };
+		559366C612B694DF004ACC1E /* ix86_fpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_fpu.c; sourceTree = "<group>"; };
+		559366C712B694DF004ACC1E /* ix86_mmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_mmx.c; sourceTree = "<group>"; };
+		559366C812B694DF004ACC1E /* ix86_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_sse.c; sourceTree = "<group>"; };
+		559366C912B694DF004ACC1E /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
 		712FD1E51093096F00575A92 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = debug.c; path = ../libpcsxcore/debug.c; sourceTree = SOURCE_ROOT; };
 		712FD1E61093096F00575A92 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = socket.c; path = ../libpcsxcore/socket.c; sourceTree = SOURCE_ROOT; };
 		712FD1E71093096F00575A92 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../libpcsxcore/socket.h; sourceTree = SOURCE_ROOT; };
@@ -258,8 +231,8 @@
 		713B530D110B75650002F164 /* ppf.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ppf.h; path = ../libpcsxcore/ppf.h; sourceTree = SOURCE_ROOT; };
 		7161C2810FDED6D000225F97 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
 		7161C2970FDED75300225F97 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedKeys.h; sourceTree = "<group>"; };
-		7192F428129C412E0042D946 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = "-2147483623"; lastKnownFileType = sourcecode.c.c; name = gpu.c; path = ../libpcsxcore/gpu.c; sourceTree = SOURCE_ROOT; };
-		7192F429129C412E0042D946 /* gpu.h */ = {isa = PBXFileReference; fileEncoding = "-2147483623"; lastKnownFileType = sourcecode.c.h; name = gpu.h; path = ../libpcsxcore/gpu.h; sourceTree = SOURCE_ROOT; };
+		7192F428129C412E0042D946 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 18446744071562067968; lastKnownFileType = sourcecode.c.c; name = gpu.c; path = ../libpcsxcore/gpu.c; sourceTree = SOURCE_ROOT; };
+		7192F429129C412E0042D946 /* gpu.h */ = {isa = PBXFileReference; fileEncoding = 18446744071562067968; lastKnownFileType = sourcecode.c.h; name = gpu.h; path = ../libpcsxcore/gpu.h; sourceTree = SOURCE_ROOT; };
 		719594AF11AEFE8C004AD686 /* gte_divider.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = gte_divider.h; path = ../libpcsxcore/gte_divider.h; sourceTree = SOURCE_ROOT; };
 		719594B011AEFE8C004AD686 /* psxcommon.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = psxcommon.c; path = ../libpcsxcore/psxcommon.c; sourceTree = SOURCE_ROOT; };
 		71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSPU.xcodeproj; path = plugins/DFSound/PeopsSPU.xcodeproj; sourceTree = SOURCE_ROOT; };
@@ -440,6 +413,8 @@
 				7192F428129C412E0042D946 /* gpu.c */,
 				7192F429129C412E0042D946 /* gpu.h */,
 				71F4C5B30FDED15800529849 /* ix86 */,
+				559366BF12B694DF004ACC1E /* ix86_64 */,
+				556A147A12B6DE1A007DE998 /* ppc */,
 				71F4C5600FDED12800529849 /* cdriso.c */,
 				71F4C5610FDED12800529849 /* cdriso.h */,
 				71F4C5620FDED12800529849 /* cdrom.c */,
@@ -493,6 +468,40 @@
 			name = libpcsxcore;
 			sourceTree = "<group>";
 		};
+		556A147A12B6DE1A007DE998 /* ppc */ = {
+			isa = PBXGroup;
+			children = (
+				556A147B12B6DE1A007DE998 /* pasm.s */,
+				556A147C12B6DE1A007DE998 /* pGte.h */,
+				556A147D12B6DE1A007DE998 /* ppc.c */,
+				556A147E12B6DE1A007DE998 /* ppc.h */,
+				556A147F12B6DE1A007DE998 /* ppc_mnemonics.h */,
+				556A148012B6DE1A007DE998 /* pR3000A.c */,
+				556A148112B6DE1A007DE998 /* reguse.c */,
+				556A148212B6DE1A007DE998 /* reguse.h */,
+			);
+			name = ppc;
+			path = ../libpcsxcore/ppc;
+			sourceTree = SOURCE_ROOT;
+		};
+		559366BF12B694DF004ACC1E /* ix86_64 */ = {
+			isa = PBXGroup;
+			children = (
+				559366C012B694DF004ACC1E /* iGte.h */,
+				559366C112B694DF004ACC1E /* iR3000A-64.c */,
+				559366C212B694DF004ACC1E /* ix86-64.c */,
+				559366C312B694DF004ACC1E /* ix86-64.h */,
+				559366C412B694DF004ACC1E /* ix86_3dnow.c */,
+				559366C512B694DF004ACC1E /* ix86_cpudetect.c */,
+				559366C612B694DF004ACC1E /* ix86_fpu.c */,
+				559366C712B694DF004ACC1E /* ix86_mmx.c */,
+				559366C812B694DF004ACC1E /* ix86_sse.c */,
+				559366C912B694DF004ACC1E /* README */,
+			);
+			name = ix86_64;
+			path = ../libpcsxcore/ix86_64;
+			sourceTree = SOURCE_ROOT;
+		};
 		71AD2DCD10C356FD00365243 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -538,64 +547,14 @@
 		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-		2BB3D68305427FE200831ACB /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2BB3D69D05427FE200831ACB /* PcsxController.h in Headers */,
-				2BB3D69E05427FE200831ACB /* ConfigurationController.h in Headers */,
-				2BB3D69F05427FE200831ACB /* PluginList.h in Headers */,
-				2BB3D6A005427FE200831ACB /* EmuThread.h in Headers */,
-				2BB3D6A105427FE200831ACB /* PcsxPlugin.h in Headers */,
-				2B4DE99105FF9307003EFEF0 /* PluginController.h in Headers */,
-				2B3E356C06937D1C00763C7D /* PcsxPluginDocument.h in Headers */,
-				71F4C58A0FDED12800529849 /* cdriso.h in Headers */,
-				71F4C58C0FDED12800529849 /* cdrom.h in Headers */,
-				71F4C58E0FDED12800529849 /* cheat.h in Headers */,
-				71F4C58F0FDED12800529849 /* coff.h in Headers */,
-				71F4C5900FDED12800529849 /* debug.h in Headers */,
-				71F4C5920FDED12800529849 /* decode_xa.h in Headers */,
-				71F4C5950FDED12800529849 /* gte.h in Headers */,
-				71F4C5970FDED12800529849 /* mdec.h in Headers */,
-				71F4C5990FDED12800529849 /* misc.h in Headers */,
-				71F4C59B0FDED12800529849 /* plugins.h in Headers */,
-				71F4C59C0FDED12800529849 /* psemu_plugin_defs.h in Headers */,
-				71F4C59E0FDED12800529849 /* psxbios.h in Headers */,
-				71F4C59F0FDED12800529849 /* psxcommon.h in Headers */,
-				71F4C5A10FDED12800529849 /* psxcounters.h in Headers */,
-				71F4C5A30FDED12800529849 /* psxdma.h in Headers */,
-				71F4C5A50FDED12800529849 /* psxhle.h in Headers */,
-				71F4C5A70FDED12800529849 /* psxhw.h in Headers */,
-				71F4C5AA0FDED12800529849 /* psxmem.h in Headers */,
-				71F4C5AC0FDED12800529849 /* r3000a.h in Headers */,
-				71F4C5AE0FDED12800529849 /* sio.h in Headers */,
-				71F4C5B00FDED12800529849 /* spu.h in Headers */,
-				71F4C5B10FDED12800529849 /* system.h in Headers */,
-				71F4C5B80FDED16D00529849 /* iGte.h in Headers */,
-				71F4C5BB0FDED16D00529849 /* ix86.h in Headers */,
-				7161C2820FDED6D000225F97 /* config.h in Headers */,
-				7161C2980FDED75300225F97 /* ExtendedKeys.h in Headers */,
-				712FD1EA1093096F00575A92 /* socket.h in Headers */,
-				713B530F110B75650002F164 /* ppf.h in Headers */,
-				719594B111AEFE8C004AD686 /* gte_divider.h in Headers */,
-				71F703A711B3A673007DD5C5 /* sjisfont.h in Headers */,
-				7192F42B129C412E0042D946 /* gpu.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
 		2BB3D68205427FE200831ACB /* PCSX */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSX" */;
 			buildPhases = (
-				2BB3D68305427FE200831ACB /* Headers */,
 				2BB3D6A205427FE200831ACB /* Resources */,
 				2BB3D6A805427FE200831ACB /* Sources */,
 				2BB3D6C505427FE200831ACB /* Frameworks */,
-				2BB3D6CD05427FE200831ACB /* Rez */,
 				71AD2DF010C3573400365243 /* Copy PlugIns */,
 			);
 			buildRules = (
@@ -620,13 +579,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsx" */;
-			buildSettings = {
-			};
-			buildStyles = (
-				7192F3FF129C410B0042D946 /* Development */,
-				7192F400129C410B0042D946 /* Deployment */,
-			);
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* Pcsx */;
 			projectDirPath = "";
 			projectReferences = (
@@ -647,6 +608,7 @@
 					ProjectRef = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
 				},
 			);
+			projectRoot = "";
 			targets = (
 				2BB3D68205427FE200831ACB /* PCSX */,
 			);
@@ -704,16 +666,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXRezBuildPhase section */
-		2BB3D6CD05427FE200831ACB /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		2BB3D6A805427FE200831ACB /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -754,6 +706,16 @@
 				713B530E110B75650002F164 /* ppf.c in Sources */,
 				719594B211AEFE8C004AD686 /* psxcommon.c in Sources */,
 				7192F42A129C412E0042D946 /* gpu.c in Sources */,
+				559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */,
+				559366CB12B694DF004ACC1E /* ix86-64.c in Sources */,
+				559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */,
+				559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */,
+				559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */,
+				559366D012B694DF004ACC1E /* ix86_sse.c in Sources */,
+				556A148312B6DE1A007DE998 /* pasm.s in Sources */,
+				556A148412B6DE1A007DE998 /* ppc.c in Sources */,
+				556A148512B6DE1A007DE998 /* pR3000A.c in Sources */,
+				556A148612B6DE1A007DE998 /* reguse.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -898,7 +860,7 @@
 		71F353F90FD98DFE00CBEC28 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
 				GCC_MODEL_TUNING = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
@@ -906,17 +868,20 @@
 					../libpcsxcore,
 					../macosx,
 				);
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
 				OTHER_LDFLAGS = (
 					"-lz",
 					"-lSystemStubs",
 				);
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Development;
 		};
 		71F353FA0FD98DFE00CBEC28 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -935,6 +900,7 @@
 					"-lz",
 					"-lSystemStubs",
 				);
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Deployment;
 		};
diff --git a/macosx/PcsxPlugin.m b/macosx/PcsxPlugin.m
index 9ee31112..56760245 100644
--- a/macosx/PcsxPlugin.m
+++ b/macosx/PcsxPlugin.m
@@ -274,7 +274,7 @@
 	return path;
 }
 
-- (unsigned)hash
+- (NSUInteger)hash
 {
     return [path hash];
 }
diff --git a/macosx/PluginController.m b/macosx/PluginController.m
index 007e6194..4bd5e4aa 100644
--- a/macosx/PluginController.m
+++ b/macosx/PluginController.m
@@ -76,6 +76,7 @@
 {
 	if (plugins) [plugins release];
 	if (defaultKey) [defaultKey release];
+	[super dealloc];
 }
 
 @end
diff --git a/macosx/main.m b/macosx/main.m
index ebd6e136..f496d43c 100644
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -47,6 +47,9 @@ int main(int argc, const char *argv[]) {
     return NSApplicationMain(argc, argv);
 }
 
+#import <IOKit/pwr_mgt/IOPMLib.h>
+static IOPMAssertionID powerAssertion= 0;
+
 int SysInit() {
 	if (!sysInited) {
 #ifdef EMU_LOG
@@ -69,6 +72,10 @@ int SysInit() {
 	}
 
 	LoadMcds(Config.Mcd1, Config.Mcd2);
+	IOReturn success= IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, &powerAssertion);
+	if (success != kIOReturnSuccess) {
+		NSLog(@"Unable to stop sleep, error code %d", success);
+	}
 
 	return 0;
 }
@@ -131,19 +138,27 @@ void SysCloseLibrary(void *lib) {
 
 // Called periodically from the emu thread
 void SysUpdate() {
-	UpdateSystemActivity(UsrActivity);
+//	UpdateSystemActivity(UsrActivity);
 
 	[emuThread handleEvents];
 }
 
 // Returns to the Gui
 void SysRunGui() {
+	if (powerAssertion != 0) {
+		IOPMAssertionRelease(powerAssertion);
+		powerAssertion = 0;
+	}
 }
 
 // Close mem and plugins
 void SysClose() {
     EmuShutdown();
     ReleasePlugins();
+	
+	if (powerAssertion != 0) {
+		IOPMAssertionRelease(powerAssertion);
+	}
 
     if (emuLog != NULL) fclose(emuLog);
 
diff --git a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj
index e5767cbf..c300cd0a 100644
--- a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj
@@ -169,9 +169,18 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFCdrom" */;
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* CdrDevMac */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				8D57630D048677EA00EA77CD /* DFCdrom */,
 			);
@@ -308,6 +317,7 @@
 		7107359F0FDEED75004AD098 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
 				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
@@ -316,6 +326,8 @@
 					../..,
 					../../../plugins/dfcdrom,
 				);
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Development;
@@ -323,6 +335,8 @@
 		710735A00FDEED75004AD098 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				GCC_MODEL_TUNING = "";
 				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
 				HEADER_SEARCH_PATHS = (
@@ -330,6 +344,7 @@
 					../..,
 					../../../plugins/dfcdrom,
 				);
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Deployment;
 		};
diff --git a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
index 35a8d87e..d981d3fd 100644
--- a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
@@ -339,9 +339,18 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 71155B110FDFA2DE00EC0BC5 /* Build configuration list for PBXProject "DFInput" */;
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* DFInput */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				8D57630D048677EA00EA77CD /* DFInput */,
 			);
@@ -509,6 +518,7 @@
 		71155B120FDFA2DE00EC0BC5 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
 				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
@@ -521,6 +531,8 @@
 					./SDL,
 					./SDL/include,
 				);
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Development;
@@ -528,6 +540,8 @@
 		71155B130FDFA2DE00EC0BC5 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
 				HEADER_SEARCH_PATHS = (
@@ -539,6 +553,7 @@
 					./SDL/include,
 					../include,
 				);
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Deployment;
 		};
diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.m b/macosx/plugins/DFInput/macsrc/MappingCell.m
index 0fb43bd1..7c04b2f7 100644
--- a/macosx/plugins/DFInput/macsrc/MappingCell.m
+++ b/macosx/plugins/DFInput/macsrc/MappingCell.m
@@ -31,13 +31,13 @@
 	return self;
 }
 
-- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(int)selStart length:(int)selLength
+- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength
 {
 	[super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength];
 
-	int whichPad = [ControllerList currentController];
+	NSInteger whichPad = [ControllerList currentController];
 	NSTableView *tableView = (NSTableView *)[self controlView];
-	int i, changed = 0, row;
+	NSInteger i, changed = 0, row;
 	NSEvent *endEvent;
 	NSPoint where = {0.0, 0.0};
 
diff --git a/macosx/plugins/DFSound/Info.plist b/macosx/plugins/DFSound/Info.plist
index 88cf687f..2c4710f6 100644
--- a/macosx/plugins/DFSound/Info.plist
+++ b/macosx/plugins/DFSound/Info.plist
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>PeopsSPU</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
diff --git a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj
index e9c81c48..cdf1f03b 100644
--- a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj
@@ -180,9 +180,18 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 71155B2B0FDFA2EB00EC0BC5 /* Build configuration list for PBXProject "PeopsSPU" */;
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* PSX Plugin */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				8D57630D048677EA00EA77CD /* PeopsSPU */,
 			);
@@ -307,12 +316,18 @@
 		71155B2C0FDFA2EB00EC0BC5 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Development;
 		};
 		71155B2E0FDFA2EB00EC0BC5 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Deployment;
 		};
diff --git a/macosx/plugins/DFSound/src/macosx.c b/macosx/plugins/DFSound/src/macosx.c
index f329ffcd..4919cbea 100755
--- a/macosx/plugins/DFSound/src/macosx.c
+++ b/macosx/plugins/DFSound/src/macosx.c
@@ -99,11 +99,12 @@ void SetupSound(void)
 	sndHeader.baseFrequency = kMiddleC;

 	sndHeader.numFrames     = buffer_size;

 	sndHeader.sampleSize    = 16;

-#ifdef __POWERPC__

-    sndHeader.format        = k16BitBigEndianFormat;

-#else

-    sndHeader.format        = k16BitLittleEndianFormat;

-#endif

+//#ifdef __POWERPC__

+//    sndHeader.format        = k16BitBigEndianFormat;

+//#else

+//    sndHeader.format        = k16BitLittleEndianFormat;

+//#endif

+	sndHeader.format		= k16BitNativeEndianFormat;

     sndHeader.compressionID = fixedCompression;

    

 	if (soundBufferAt != -1)

diff --git a/macosx/plugins/DFXVideo/Info.plist b/macosx/plugins/DFXVideo/Info.plist
index 81130249..aeec11cf 100644
--- a/macosx/plugins/DFXVideo/Info.plist
+++ b/macosx/plugins/DFXVideo/Info.plist
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>PeopsSoftGL</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.sf.peops.SoftGpuGLPlugin</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj
index 9657f8c3..f637857d 100644
--- a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj
@@ -8,18 +8,12 @@
 
 /* Begin PBXBuildFile section */
 		2B038C07069183300082466B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2B038C05069183300082466B /* InfoPlist.strings */; };
-		2B038D2306918AA80082466B /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2B038D2206918AA80082466B /* Info.plist */; };
-		2B143C79078A0C6700AF745A /* PluginWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B957EAE0635DFE400543905 /* PluginWindow.h */; };
-		2B57868206BE7B3700BBA288 /* ExtendedKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B57868106BE7B3700BBA288 /* ExtendedKeys.h */; };
 		2B957EB10635DFE400543905 /* PluginWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B957EAF0635DFE400543905 /* PluginWindow.m */; };
 		2B959DC106342C22000F2A2D /* drawgl.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E5D64062B2CC1001D796E /* drawgl.m */; };
-		2B959DC406342C23000F2A2D /* PluginGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BAF4FC90632967A00DB9A16 /* PluginGLView.h */; };
 		2B959DCD06342C24000F2A2D /* PluginGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BAF4FCA0632967A00DB9A16 /* PluginGLView.m */; };
-		2B959DD006342C25000F2A2D /* PluginWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B3E5DF0062B36FB001D796E /* PluginWindowController.h */; };
 		2B959DD506342C25000F2A2D /* PluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E5DF1062B36FB001D796E /* PluginWindowController.m */; };
 		2B959DE106342C31000F2A2D /* NetSfPeopsSoftGPUInterface.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */; };
 		2B959E4406342D32000F2A2D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B959E4306342D32000F2A2D /* OpenGL.framework */; };
-		2BB260A80777462E00F6854C /* PluginConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BB260A60777462E00F6854C /* PluginConfigController.h */; };
 		2BB260A90777462E00F6854C /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BB260A70777462E00F6854C /* PluginConfigController.m */; };
 		2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E767077AF53E00657C69 /* Credits.rtf */; };
 		2BD2E829077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */; };
@@ -35,7 +29,7 @@
 
 /* Begin PBXFileReference section */
 		2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+		2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2B371FBB0773859200B1DC0B /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.nib; sourceTree = "<group>"; };
 		2B3E5D64062B2CC1001D796E /* drawgl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = drawgl.m; path = macsrc/drawgl.m; sourceTree = SOURCE_ROOT; };
 		2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = NetSfPeopsSoftGPUInterface.nib; sourceTree = "<group>"; };
@@ -169,27 +163,11 @@
 		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-		2BAF508E0632BB1A00DB9A16 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2B959DC406342C23000F2A2D /* PluginGLView.h in Headers */,
-				2B959DD006342C25000F2A2D /* PluginWindowController.h in Headers */,
-				2B57868206BE7B3700BBA288 /* ExtendedKeys.h in Headers */,
-				2BB260A80777462E00F6854C /* PluginConfigController.h in Headers */,
-				2B143C79078A0C6700AF745A /* PluginWindow.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
 		2BAF50920632BB1A00DB9A16 /* gpuPeopsSoftGL */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 7170842C0FDFD328004F3EB4 /* Build configuration list for PBXNativeTarget "gpuPeopsSoftGL" */;
 			buildPhases = (
-				2BAF508E0632BB1A00DB9A16 /* Headers */,
 				2BAF508F0632BB1A00DB9A16 /* Resources */,
 				2BAF50900632BB1A00DB9A16 /* Sources */,
 				2BAF50910632BB1A00DB9A16 /* Frameworks */,
@@ -209,10 +187,19 @@
 		2B3E5A03062AAC1A001D796E /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsSoftGPU" */;
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 2B3E59FF062AAC1A001D796E;
 			productRefGroup = 2B3E5A46062AACF3001D796E /* Products */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				2BAF50920632BB1A00DB9A16 /* gpuPeopsSoftGL */,
 			);
@@ -226,7 +213,6 @@
 			files = (
 				2B959DE106342C31000F2A2D /* NetSfPeopsSoftGPUInterface.nib in Resources */,
 				2B038C07069183300082466B /* InfoPlist.strings in Resources */,
-				2B038D2306918AA80082466B /* Info.plist in Resources */,
 				2BD2E829077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib in Resources */,
 				2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */,
 			);
@@ -370,22 +356,28 @@
 		717084320FDFD328004F3EB4 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
 				GCC_MODEL_TUNING = "";
 				HEADER_SEARCH_PATHS = (
 					../../../plugins/dfxvideo,
 					../../../libpcsxcore,
 				);
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Development;
 		};
 		717084330FDFD328004F3EB4 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				GCC_MODEL_TUNING = "";
 				HEADER_SEARCH_PATHS = (
 					../../../plugins/dfxvideo,
 					../../../libpcsxcore,
 				);
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Deployment;
 		};
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
index 96b05ff4..9c760ccd 100644
--- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
@@ -568,7 +568,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 
 				row = 0;
 				// make sure the reads are aligned
-				while ((int)pD & 0x3) {
+				while ((intptr_t)pD & 0x3) {
 					*((unsigned long *)((surf)+(column*lPitch)+(row<<2))) =
 						(*(pD+0)<<16)|(*(pD+1)<<8)|*(pD+2);
 
@@ -582,7 +582,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 					unsigned long lu2 = *((unsigned long *)pD+1);
 					unsigned long lu3 = *((unsigned long *)pD+2);
 					unsigned long *dst = ((unsigned long *)((surf)+(column*lPitch)+(row<<2)));
-#ifdef __POWERPC__
+#ifdef __BIG_ENDIAN__
 					*(dst)=
 						(((lu1>>24)&0xff)<<16)|(((lu1>>16)&0xff)<<8)|(((lu1>>8)&0xff));
 					*(dst+1)=
@@ -629,7 +629,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 			{
 				for(row=0;row<dx;row++)
 				{
-#ifdef __POWERPC__
+#ifdef __BIG_ENDIAN__
 					lu=GETLE16D(SRCPtr++);
 #else
 					lu=*SRCPtr++;