preparing for refactor/cleanup, moved all definations into .c files, other minor cleanups. (Breaks Mac OS X and maybe windows as well for now, will fix later.)

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

28 files changed, 569 insertions, 393 deletions

diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am
index 81c0a439..7df905f6 100644
--- a/libpcsxcore/Makefile.am
+++ b/libpcsxcore/Makefile.am
@@ -32,6 +32,7 @@ libpcsxcore_a_SOURCES = \
 	$(top_builddir)/libpcsxcore/plugins.h \
 	$(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
 	$(top_builddir)/libpcsxcore/psxbios.h \
+	$(top_builddir)/libpcsxcore/psxcommon.c \
 	$(top_builddir)/libpcsxcore/psxcommon.h \
 	$(top_builddir)/libpcsxcore/psxcounters.h \
 	$(top_builddir)/libpcsxcore/psxdma.h \
diff --git a/libpcsxcore/Makefile.in b/libpcsxcore/Makefile.in
index d9392ea9..923f99b9 100644
--- a/libpcsxcore/Makefile.in
+++ b/libpcsxcore/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -64,6 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 libpcsxcore_a_AR = $(AR) $(ARFLAGS)
@@ -97,6 +100,7 @@ am__libpcsxcore_a_SOURCES_DIST =  \
 	$(top_builddir)/libpcsxcore/plugins.h \
 	$(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
 	$(top_builddir)/libpcsxcore/psxbios.h \
+	$(top_builddir)/libpcsxcore/psxcommon.c \
 	$(top_builddir)/libpcsxcore/psxcommon.h \
 	$(top_builddir)/libpcsxcore/psxcounters.h \
 	$(top_builddir)/libpcsxcore/psxdma.h \
@@ -143,13 +147,14 @@ am_libpcsxcore_a_OBJECTS = psxbios.$(OBJEXT) cdrom.$(OBJEXT) \
 	psxmem.$(OBJEXT) misc.$(OBJEXT) plugins.$(OBJEXT) \
 	decode_xa.$(OBJEXT) r3000a.$(OBJEXT) psxinterpreter.$(OBJEXT) \
 	gte.$(OBJEXT) psxhle.$(OBJEXT) debug.$(OBJEXT) \
-	cdriso.$(OBJEXT) cheat.$(OBJEXT) socket.$(OBJEXT) \
-	ppf.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3)
+	psxcommon.$(OBJEXT) cdriso.$(OBJEXT) cheat.$(OBJEXT) \
+	socket.$(OBJEXT) ppf.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) $(am__objects_3)
 libpcsxcore_a_OBJECTS = $(am_libpcsxcore_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -243,6 +248,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PEOPSXGL = @PEOPSXGL@
@@ -351,6 +357,7 @@ libpcsxcore_a_SOURCES = $(top_builddir)/libpcsxcore/psxbios.c \
 	$(top_builddir)/libpcsxcore/plugins.h \
 	$(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
 	$(top_builddir)/libpcsxcore/psxbios.h \
+	$(top_builddir)/libpcsxcore/psxcommon.c \
 	$(top_builddir)/libpcsxcore/psxcommon.h \
 	$(top_builddir)/libpcsxcore/psxcounters.h \
 	$(top_builddir)/libpcsxcore/psxdma.h \
@@ -384,9 +391,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libpcsxcore/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libpcsxcore/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpcsxcore/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libpcsxcore/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -404,6 +411,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -441,6 +449,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxbios.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxcommon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxcounters.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxdma.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxhle.Po@am__quote@
@@ -455,497 +464,511 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 psxbios.o: $(top_builddir)/libpcsxcore/psxbios.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxbios.o -MD -MP -MF $(DEPDIR)/psxbios.Tpo -c -o psxbios.o `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxbios.c' object='psxbios.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxbios.o `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
 
 psxbios.obj: $(top_builddir)/libpcsxcore/psxbios.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxbios.obj -MD -MP -MF $(DEPDIR)/psxbios.Tpo -c -o psxbios.obj `if test -f '$(top_builddir)/libpcsxcore/psxbios.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxbios.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxbios.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxbios.c' object='psxbios.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxbios.obj `if test -f '$(top_builddir)/libpcsxcore/psxbios.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxbios.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxbios.c'; fi`
 
 cdrom.o: $(top_builddir)/libpcsxcore/cdrom.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdrom.o -MD -MP -MF $(DEPDIR)/cdrom.Tpo -c -o cdrom.o `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdrom.c' object='cdrom.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrom.o `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
 
 cdrom.obj: $(top_builddir)/libpcsxcore/cdrom.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdrom.obj -MD -MP -MF $(DEPDIR)/cdrom.Tpo -c -o cdrom.obj `if test -f '$(top_builddir)/libpcsxcore/cdrom.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdrom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdrom.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdrom.c' object='cdrom.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrom.obj `if test -f '$(top_builddir)/libpcsxcore/cdrom.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdrom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdrom.c'; fi`
 
 psxcounters.o: $(top_builddir)/libpcsxcore/psxcounters.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcounters.o -MD -MP -MF $(DEPDIR)/psxcounters.Tpo -c -o psxcounters.o `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcounters.c' object='psxcounters.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcounters.o `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
 
 psxcounters.obj: $(top_builddir)/libpcsxcore/psxcounters.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcounters.obj -MD -MP -MF $(DEPDIR)/psxcounters.Tpo -c -o psxcounters.obj `if test -f '$(top_builddir)/libpcsxcore/psxcounters.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcounters.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcounters.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcounters.c' object='psxcounters.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcounters.obj `if test -f '$(top_builddir)/libpcsxcore/psxcounters.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcounters.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcounters.c'; fi`
 
 psxdma.o: $(top_builddir)/libpcsxcore/psxdma.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxdma.o -MD -MP -MF $(DEPDIR)/psxdma.Tpo -c -o psxdma.o `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxdma.c' object='psxdma.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxdma.o `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
 
 psxdma.obj: $(top_builddir)/libpcsxcore/psxdma.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxdma.obj -MD -MP -MF $(DEPDIR)/psxdma.Tpo -c -o psxdma.obj `if test -f '$(top_builddir)/libpcsxcore/psxdma.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxdma.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxdma.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxdma.c' object='psxdma.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxdma.obj `if test -f '$(top_builddir)/libpcsxcore/psxdma.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxdma.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxdma.c'; fi`
 
 disr3000a.o: $(top_builddir)/libpcsxcore/disr3000a.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT disr3000a.o -MD -MP -MF $(DEPDIR)/disr3000a.Tpo -c -o disr3000a.o `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/disr3000a.c' object='disr3000a.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o disr3000a.o `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
 
 disr3000a.obj: $(top_builddir)/libpcsxcore/disr3000a.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT disr3000a.obj -MD -MP -MF $(DEPDIR)/disr3000a.Tpo -c -o disr3000a.obj `if test -f '$(top_builddir)/libpcsxcore/disr3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/disr3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/disr3000a.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/disr3000a.c' object='disr3000a.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o disr3000a.obj `if test -f '$(top_builddir)/libpcsxcore/disr3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/disr3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/disr3000a.c'; fi`
 
 spu.o: $(top_builddir)/libpcsxcore/spu.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.o -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.o `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/spu.c' object='spu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.o `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
 
 spu.obj: $(top_builddir)/libpcsxcore/spu.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.obj -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.obj `if test -f '$(top_builddir)/libpcsxcore/spu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/spu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/spu.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/spu.c' object='spu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.obj `if test -f '$(top_builddir)/libpcsxcore/spu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/spu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/spu.c'; fi`
 
 sio.o: $(top_builddir)/libpcsxcore/sio.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sio.o -MD -MP -MF $(DEPDIR)/sio.Tpo -c -o sio.o `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/sio.c' object='sio.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sio.o `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
 
 sio.obj: $(top_builddir)/libpcsxcore/sio.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sio.obj -MD -MP -MF $(DEPDIR)/sio.Tpo -c -o sio.obj `if test -f '$(top_builddir)/libpcsxcore/sio.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/sio.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/sio.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/sio.c' object='sio.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sio.obj `if test -f '$(top_builddir)/libpcsxcore/sio.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/sio.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/sio.c'; fi`
 
 psxhw.o: $(top_builddir)/libpcsxcore/psxhw.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhw.o -MD -MP -MF $(DEPDIR)/psxhw.Tpo -c -o psxhw.o `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhw.c' object='psxhw.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhw.o `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
 
 psxhw.obj: $(top_builddir)/libpcsxcore/psxhw.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhw.obj -MD -MP -MF $(DEPDIR)/psxhw.Tpo -c -o psxhw.obj `if test -f '$(top_builddir)/libpcsxcore/psxhw.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhw.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhw.c' object='psxhw.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhw.obj `if test -f '$(top_builddir)/libpcsxcore/psxhw.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhw.c'; fi`
 
 mdec.o: $(top_builddir)/libpcsxcore/mdec.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdec.o -MD -MP -MF $(DEPDIR)/mdec.Tpo -c -o mdec.o `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/mdec.c' object='mdec.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdec.o `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
 
 mdec.obj: $(top_builddir)/libpcsxcore/mdec.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdec.obj -MD -MP -MF $(DEPDIR)/mdec.Tpo -c -o mdec.obj `if test -f '$(top_builddir)/libpcsxcore/mdec.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/mdec.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/mdec.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/mdec.c' object='mdec.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdec.obj `if test -f '$(top_builddir)/libpcsxcore/mdec.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/mdec.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/mdec.c'; fi`
 
 psxmem.o: $(top_builddir)/libpcsxcore/psxmem.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxmem.o -MD -MP -MF $(DEPDIR)/psxmem.Tpo -c -o psxmem.o `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxmem.c' object='psxmem.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxmem.o `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
 
 psxmem.obj: $(top_builddir)/libpcsxcore/psxmem.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxmem.obj -MD -MP -MF $(DEPDIR)/psxmem.Tpo -c -o psxmem.obj `if test -f '$(top_builddir)/libpcsxcore/psxmem.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxmem.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxmem.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxmem.c' object='psxmem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxmem.obj `if test -f '$(top_builddir)/libpcsxcore/psxmem.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxmem.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxmem.c'; fi`
 
 misc.o: $(top_builddir)/libpcsxcore/misc.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
 
 misc.obj: $(top_builddir)/libpcsxcore/misc.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_builddir)/libpcsxcore/misc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/misc.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_builddir)/libpcsxcore/misc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/misc.c'; fi`
 
 plugins.o: $(top_builddir)/libpcsxcore/plugins.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugins.o -MD -MP -MF $(DEPDIR)/plugins.Tpo -c -o plugins.o `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/plugins.c' object='plugins.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plugins.o `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
 
 plugins.obj: $(top_builddir)/libpcsxcore/plugins.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugins.obj -MD -MP -MF $(DEPDIR)/plugins.Tpo -c -o plugins.obj `if test -f '$(top_builddir)/libpcsxcore/plugins.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/plugins.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/plugins.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/plugins.c' object='plugins.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plugins.obj `if test -f '$(top_builddir)/libpcsxcore/plugins.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/plugins.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/plugins.c'; fi`
 
 decode_xa.o: $(top_builddir)/libpcsxcore/decode_xa.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode_xa.o -MD -MP -MF $(DEPDIR)/decode_xa.Tpo -c -o decode_xa.o `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/decode_xa.c' object='decode_xa.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode_xa.o `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
 
 decode_xa.obj: $(top_builddir)/libpcsxcore/decode_xa.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode_xa.obj -MD -MP -MF $(DEPDIR)/decode_xa.Tpo -c -o decode_xa.obj `if test -f '$(top_builddir)/libpcsxcore/decode_xa.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/decode_xa.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/decode_xa.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/decode_xa.c' object='decode_xa.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode_xa.obj `if test -f '$(top_builddir)/libpcsxcore/decode_xa.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/decode_xa.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/decode_xa.c'; fi`
 
 r3000a.o: $(top_builddir)/libpcsxcore/r3000a.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT r3000a.o -MD -MP -MF $(DEPDIR)/r3000a.Tpo -c -o r3000a.o `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/r3000a.c' object='r3000a.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o r3000a.o `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
 
 r3000a.obj: $(top_builddir)/libpcsxcore/r3000a.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT r3000a.obj -MD -MP -MF $(DEPDIR)/r3000a.Tpo -c -o r3000a.obj `if test -f '$(top_builddir)/libpcsxcore/r3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/r3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/r3000a.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/r3000a.c' object='r3000a.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o r3000a.obj `if test -f '$(top_builddir)/libpcsxcore/r3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/r3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/r3000a.c'; fi`
 
 psxinterpreter.o: $(top_builddir)/libpcsxcore/psxinterpreter.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxinterpreter.o -MD -MP -MF $(DEPDIR)/psxinterpreter.Tpo -c -o psxinterpreter.o `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxinterpreter.c' object='psxinterpreter.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxinterpreter.o `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
 
 psxinterpreter.obj: $(top_builddir)/libpcsxcore/psxinterpreter.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxinterpreter.obj -MD -MP -MF $(DEPDIR)/psxinterpreter.Tpo -c -o psxinterpreter.obj `if test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxinterpreter.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxinterpreter.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxinterpreter.c' object='psxinterpreter.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxinterpreter.obj `if test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxinterpreter.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxinterpreter.c'; fi`
 
 gte.o: $(top_builddir)/libpcsxcore/gte.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gte.o -MD -MP -MF $(DEPDIR)/gte.Tpo -c -o gte.o `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/gte.c' object='gte.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gte.o `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
 
 gte.obj: $(top_builddir)/libpcsxcore/gte.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gte.obj -MD -MP -MF $(DEPDIR)/gte.Tpo -c -o gte.obj `if test -f '$(top_builddir)/libpcsxcore/gte.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/gte.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/gte.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/gte.c' object='gte.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gte.obj `if test -f '$(top_builddir)/libpcsxcore/gte.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/gte.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/gte.c'; fi`
 
 psxhle.o: $(top_builddir)/libpcsxcore/psxhle.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhle.o -MD -MP -MF $(DEPDIR)/psxhle.Tpo -c -o psxhle.o `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhle.c' object='psxhle.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhle.o `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
 
 psxhle.obj: $(top_builddir)/libpcsxcore/psxhle.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhle.obj -MD -MP -MF $(DEPDIR)/psxhle.Tpo -c -o psxhle.obj `if test -f '$(top_builddir)/libpcsxcore/psxhle.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhle.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhle.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhle.c' object='psxhle.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhle.obj `if test -f '$(top_builddir)/libpcsxcore/psxhle.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhle.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhle.c'; fi`
 
 debug.o: $(top_builddir)/libpcsxcore/debug.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.o -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.o `test -f '$(top_builddir)/libpcsxcore/debug.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/debug.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/debug.c' object='debug.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.o `test -f '$(top_builddir)/libpcsxcore/debug.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/debug.c
 
 debug.obj: $(top_builddir)/libpcsxcore/debug.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.obj -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.obj `if test -f '$(top_builddir)/libpcsxcore/debug.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/debug.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/debug.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/debug.c' object='debug.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.obj `if test -f '$(top_builddir)/libpcsxcore/debug.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/debug.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/debug.c'; fi`
 
+psxcommon.o: $(top_builddir)/libpcsxcore/psxcommon.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcommon.o -MD -MP -MF $(DEPDIR)/psxcommon.Tpo -c -o psxcommon.o `test -f '$(top_builddir)/libpcsxcore/psxcommon.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcommon.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxcommon.Tpo $(DEPDIR)/psxcommon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcommon.c' object='psxcommon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcommon.o `test -f '$(top_builddir)/libpcsxcore/psxcommon.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcommon.c
+
+psxcommon.obj: $(top_builddir)/libpcsxcore/psxcommon.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcommon.obj -MD -MP -MF $(DEPDIR)/psxcommon.Tpo -c -o psxcommon.obj `if test -f '$(top_builddir)/libpcsxcore/psxcommon.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcommon.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcommon.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psxcommon.Tpo $(DEPDIR)/psxcommon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcommon.c' object='psxcommon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcommon.obj `if test -f '$(top_builddir)/libpcsxcore/psxcommon.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcommon.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcommon.c'; fi`
+
 cdriso.o: $(top_builddir)/libpcsxcore/cdriso.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdriso.o -MD -MP -MF $(DEPDIR)/cdriso.Tpo -c -o cdriso.o `test -f '$(top_builddir)/libpcsxcore/cdriso.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdriso.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdriso.Tpo $(DEPDIR)/cdriso.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cdriso.Tpo $(DEPDIR)/cdriso.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdriso.c' object='cdriso.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdriso.o `test -f '$(top_builddir)/libpcsxcore/cdriso.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdriso.c
 
 cdriso.obj: $(top_builddir)/libpcsxcore/cdriso.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdriso.obj -MD -MP -MF $(DEPDIR)/cdriso.Tpo -c -o cdriso.obj `if test -f '$(top_builddir)/libpcsxcore/cdriso.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdriso.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdriso.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdriso.Tpo $(DEPDIR)/cdriso.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cdriso.Tpo $(DEPDIR)/cdriso.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdriso.c' object='cdriso.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdriso.obj `if test -f '$(top_builddir)/libpcsxcore/cdriso.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdriso.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdriso.c'; fi`
 
 cheat.o: $(top_builddir)/libpcsxcore/cheat.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cheat.o -MD -MP -MF $(DEPDIR)/cheat.Tpo -c -o cheat.o `test -f '$(top_builddir)/libpcsxcore/cheat.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cheat.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cheat.Tpo $(DEPDIR)/cheat.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cheat.Tpo $(DEPDIR)/cheat.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cheat.c' object='cheat.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cheat.o `test -f '$(top_builddir)/libpcsxcore/cheat.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cheat.c
 
 cheat.obj: $(top_builddir)/libpcsxcore/cheat.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cheat.obj -MD -MP -MF $(DEPDIR)/cheat.Tpo -c -o cheat.obj `if test -f '$(top_builddir)/libpcsxcore/cheat.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cheat.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cheat.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cheat.Tpo $(DEPDIR)/cheat.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cheat.Tpo $(DEPDIR)/cheat.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cheat.c' object='cheat.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cheat.obj `if test -f '$(top_builddir)/libpcsxcore/cheat.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cheat.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cheat.c'; fi`
 
 socket.o: $(top_builddir)/libpcsxcore/socket.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT socket.o -MD -MP -MF $(DEPDIR)/socket.Tpo -c -o socket.o `test -f '$(top_builddir)/libpcsxcore/socket.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/socket.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/socket.c' object='socket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o socket.o `test -f '$(top_builddir)/libpcsxcore/socket.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/socket.c
 
 socket.obj: $(top_builddir)/libpcsxcore/socket.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT socket.obj -MD -MP -MF $(DEPDIR)/socket.Tpo -c -o socket.obj `if test -f '$(top_builddir)/libpcsxcore/socket.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/socket.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/socket.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/socket.c' object='socket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o socket.obj `if test -f '$(top_builddir)/libpcsxcore/socket.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/socket.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/socket.c'; fi`
 
 ppf.o: $(top_builddir)/libpcsxcore/ppf.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppf.o -MD -MP -MF $(DEPDIR)/ppf.Tpo -c -o ppf.o `test -f '$(top_builddir)/libpcsxcore/ppf.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppf.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppf.c' object='ppf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppf.o `test -f '$(top_builddir)/libpcsxcore/ppf.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppf.c
 
 ppf.obj: $(top_builddir)/libpcsxcore/ppf.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppf.obj -MD -MP -MF $(DEPDIR)/ppf.Tpo -c -o ppf.obj `if test -f '$(top_builddir)/libpcsxcore/ppf.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppf.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppf.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppf.c' object='ppf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppf.obj `if test -f '$(top_builddir)/libpcsxcore/ppf.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppf.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppf.c'; fi`
 
 iR3000A-64.o: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.o -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' object='iR3000A-64.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
 
 iR3000A-64.obj: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.obj -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' object='iR3000A-64.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; fi`
 
 ix86-64.o: $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86-64.o -MD -MP -MF $(DEPDIR)/ix86-64.Tpo -c -o ix86-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' object='ix86-64.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
 
 ix86-64.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86-64.obj -MD -MP -MF $(DEPDIR)/ix86-64.Tpo -c -o ix86-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' object='ix86-64.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; fi`
 
 ix86_cpudetect.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_cpudetect.o -MD -MP -MF $(DEPDIR)/ix86_cpudetect.Tpo -c -o ix86_cpudetect.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' object='ix86_cpudetect.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_cpudetect.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
 
 ix86_cpudetect.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_cpudetect.obj -MD -MP -MF $(DEPDIR)/ix86_cpudetect.Tpo -c -o ix86_cpudetect.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' object='ix86_cpudetect.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_cpudetect.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; fi`
 
 ix86_fpu.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_fpu.o -MD -MP -MF $(DEPDIR)/ix86_fpu.Tpo -c -o ix86_fpu.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' object='ix86_fpu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_fpu.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
 
 ix86_fpu.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_fpu.obj -MD -MP -MF $(DEPDIR)/ix86_fpu.Tpo -c -o ix86_fpu.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' object='ix86_fpu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_fpu.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; fi`
 
 ix86_3dnow.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_3dnow.o -MD -MP -MF $(DEPDIR)/ix86_3dnow.Tpo -c -o ix86_3dnow.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' object='ix86_3dnow.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_3dnow.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
 
 ix86_3dnow.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_3dnow.obj -MD -MP -MF $(DEPDIR)/ix86_3dnow.Tpo -c -o ix86_3dnow.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' object='ix86_3dnow.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_3dnow.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; fi`
 
 ix86_mmx.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_mmx.o -MD -MP -MF $(DEPDIR)/ix86_mmx.Tpo -c -o ix86_mmx.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' object='ix86_mmx.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_mmx.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
 
 ix86_mmx.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_mmx.obj -MD -MP -MF $(DEPDIR)/ix86_mmx.Tpo -c -o ix86_mmx.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' object='ix86_mmx.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_mmx.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; fi`
 
 ix86_sse.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_sse.o -MD -MP -MF $(DEPDIR)/ix86_sse.Tpo -c -o ix86_sse.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' object='ix86_sse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_sse.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
 
 ix86_sse.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_sse.obj -MD -MP -MF $(DEPDIR)/ix86_sse.Tpo -c -o ix86_sse.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' object='ix86_sse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_sse.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; fi`
 
 iR3000A.o: $(top_builddir)/libpcsxcore/ix86/iR3000A.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A.o -MD -MP -MF $(DEPDIR)/iR3000A.Tpo -c -o iR3000A.o `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/iR3000A.c' object='iR3000A.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A.o `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
 
 iR3000A.obj: $(top_builddir)/libpcsxcore/ix86/iR3000A.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A.obj -MD -MP -MF $(DEPDIR)/iR3000A.Tpo -c -o iR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/iR3000A.c' object='iR3000A.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; fi`
 
 ix86.o: $(top_builddir)/libpcsxcore/ix86/ix86.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86.o -MD -MP -MF $(DEPDIR)/ix86.Tpo -c -o ix86.o `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/ix86.c' object='ix86.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86.o `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
 
 ix86.obj: $(top_builddir)/libpcsxcore/ix86/ix86.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86.obj -MD -MP -MF $(DEPDIR)/ix86.Tpo -c -o ix86.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/ix86.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/ix86.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/ix86.c' object='ix86.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/ix86.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/ix86.c'; fi`
 
 pR3000A.o: $(top_builddir)/libpcsxcore/ppc/pR3000A.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pR3000A.o -MD -MP -MF $(DEPDIR)/pR3000A.Tpo -c -o pR3000A.o `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/pR3000A.c' object='pR3000A.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pR3000A.o `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
 
 pR3000A.obj: $(top_builddir)/libpcsxcore/ppc/pR3000A.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pR3000A.obj -MD -MP -MF $(DEPDIR)/pR3000A.Tpo -c -o pR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/pR3000A.c' object='pR3000A.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; fi`
 
 ppc.o: $(top_builddir)/libpcsxcore/ppc/ppc.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppc.o -MD -MP -MF $(DEPDIR)/ppc.Tpo -c -o ppc.o `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/ppc.c' object='ppc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppc.o `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
 
 ppc.obj: $(top_builddir)/libpcsxcore/ppc/ppc.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppc.obj -MD -MP -MF $(DEPDIR)/ppc.Tpo -c -o ppc.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/ppc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/ppc.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/ppc.c' object='ppc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppc.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/ppc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/ppc.c'; fi`
 
 reguse.o: $(top_builddir)/libpcsxcore/ppc/reguse.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reguse.o -MD -MP -MF $(DEPDIR)/reguse.Tpo -c -o reguse.o `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/reguse.c' object='reguse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reguse.o `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
 
 reguse.obj: $(top_builddir)/libpcsxcore/ppc/reguse.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reguse.obj -MD -MP -MF $(DEPDIR)/reguse.Tpo -c -o reguse.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/reguse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/reguse.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/reguse.c' object='reguse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reguse.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/reguse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/reguse.c'; fi`
@@ -983,7 +1006,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -991,29 +1014,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1034,13 +1062,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -1068,6 +1100,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1089,6 +1122,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -1097,18 +1132,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1146,6 +1191,7 @@ uninstall-am:
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 597dbdfc..856cee9a 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -31,9 +31,9 @@
 #include <sys/time.h>
 #endif
 
-FILE *cdHandle = NULL;
-FILE *cddaHandle = NULL;
-FILE *subHandle = NULL;
+static FILE *cdHandle = NULL;
+static FILE *cddaHandle = NULL;
+static FILE *subHandle = NULL;
 
 static char subChanInterleaved = 0;
 
@@ -843,9 +843,7 @@ static long CALLBACK ISOgetStatus(struct CdrStat *stat) {
 	return 0;
 }
 
-void imageReaderInit(void) {
-	assert(hCDRDriver == NULL);
-
+void cdrIsoInit(void) {
 	CDR_init = ISOinit;
 	CDR_shutdown = ISOshutdown;
 	CDR_open = ISOopen;
@@ -867,3 +865,7 @@ void imageReaderInit(void) {
 
 	numtracks = 0;
 }
+
+int cdrIsoActive(void) {
+	return (cdHandle != NULL);
+}
diff --git a/libpcsxcore/cdriso.h b/libpcsxcore/cdriso.h
index 98fec173..85ecaa11 100644
--- a/libpcsxcore/cdriso.h
+++ b/libpcsxcore/cdriso.h
@@ -21,13 +21,7 @@
 #ifndef CDRISO_H
 #define CDRISO_H
 
-void imageReaderInit(void);
-
-#define MSF2SECT(m, s, f)		(((m) * 60 + (s) - 2) * 75 + (f))
-
-#define CD_FRAMESIZE_RAW		2352
-#define DATA_SIZE				(CD_FRAMESIZE_RAW - 12)
-
-#define SUB_FRAMESIZE			96
+void cdrIsoInit(void);
+int cdrIsoActive(void);
 
 #endif
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index dfd9a2e4..66edcab4 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -24,6 +24,8 @@
 #include "cdrom.h"
 #include "ppf.h"
 
+cdrStruct cdr;
+
 /* CD-ROM magic numbers */
 #define CdlSync        0
 #define CdlNop         1
@@ -630,14 +632,14 @@ void cdrReadInterrupt() {
 #ifdef CDR_LOG
 		fprintf(emuLog, "cdrReadInterrupt() Log: err\n");
 #endif
-		memset(cdr.Transfer, 0, 2340);
+		memset(cdr.Transfer, 0, DATA_SIZE);
 		cdr.Stat = DiskError;
 		cdr.Result[0] |= 0x01;
 		CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
 		return;
 	}
 
-	memcpy(cdr.Transfer, buf, 2340);
+	memcpy(cdr.Transfer, buf, DATA_SIZE);
 	CheckPPFCache(cdr.Transfer, cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
 
     cdr.Stat = DataReady;
diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h
index f817a8f4..f2ea29b1 100644
--- a/libpcsxcore/cdrom.h
+++ b/libpcsxcore/cdrom.h
@@ -27,8 +27,15 @@
 #include "psxmem.h"
 #include "psxhw.h"
 
-#define btoi(b)     ((b)/16*10 + (b)%16)    /* BCD to u_char */
-#define itob(i)     ((i)/10*16 + (i)%10)    /* u_char to BCD */
+#define btoi(b)     ((b) / 16 * 10 + (b) % 16) /* BCD to u_char */
+#define itob(i)     ((i) / 10 * 16 + (i) % 10) /* u_char to BCD */
+
+#define MSF2SECT(m, s, f)		(((m) * 60 + (s) - 2) * 75 + (f))
+
+#define CD_FRAMESIZE_RAW		2352
+#define DATA_SIZE				(CD_FRAMESIZE_RAW - 12)
+
+#define SUB_FRAMESIZE			96
 
 typedef struct {
 	unsigned char OCUP;
@@ -40,7 +47,7 @@ typedef struct {
 
 	unsigned char StatP;
 
-	unsigned char Transfer[2352];
+	unsigned char Transfer[CD_FRAMESIZE_RAW];
 	unsigned char *pTransfer;
 
 	unsigned char Prev[4];
@@ -80,7 +87,7 @@ typedef struct {
 	char Unused[4083];
 } cdrStruct;
 
-cdrStruct cdr;
+extern cdrStruct cdr;
 
 void cdrReset();
 void cdrInterrupt();
@@ -95,4 +102,4 @@ void cdrWrite2(unsigned char rt);
 void cdrWrite3(unsigned char rt);
 int cdrFreeze(gzFile f, int Mode);
 
-#endif /* __CDROM_H__ */
+#endif
diff --git a/libpcsxcore/debug.h b/libpcsxcore/debug.h
index 2e073721..808c8de0 100644
--- a/libpcsxcore/debug.h
+++ b/libpcsxcore/debug.h
@@ -39,11 +39,8 @@ extern char *disRNameCP0[];
 
 char* disR3000AF(u32 code, u32 pc);
 
-FILE *emuLog;
-
 /* 
  * Specficies which logs should be activated.
- * Ryan TODO: These should ALL be definable with configure flags.
  */
 
 //#define LOG_STDOUT
@@ -65,4 +62,4 @@ FILE *emuLog;
 #define EMU_LOG __Log
 #endif
 
-#endif /* __DEBUG_H__ */
+#endif
diff --git a/libpcsxcore/ix86_64/iR3000A-64.c b/libpcsxcore/ix86_64/iR3000A-64.c
index 399ec09f..babec3f1 100644
--- a/libpcsxcore/ix86_64/iR3000A-64.c
+++ b/libpcsxcore/ix86_64/iR3000A-64.c
@@ -33,16 +33,16 @@
 
 uptr* psxRecLUT;
 
-#define PTRMULT (sizeof(uptr)/sizeof(u32))
+#define PTRMULT (sizeof(uptr) / sizeof(u32))
 
 #undef PC_REC
 #undef PC_REC8
 #undef PC_REC16
 #undef PC_REC32
-#define PC_REC(x)	(psxRecLUT[(x) >> 16] + PTRMULT*((x) & 0xffff))
-#define PC_RECP(x) (*(uptr*)PC_REC(x))
+#define PC_REC(x)	(psxRecLUT[(x) >> 16] + PTRMULT * ((x) & 0xffff))
+#define PC_RECP(x) (*(uptr *)PC_REC(x))
 
-#define RECMEM_SIZE		(PTRMULT*8*1024*1024)
+#define RECMEM_SIZE		(PTRMULT * 8 * 1024 * 1024)
 
 static char *recMem;	/* the recompiled blocks will be here */
 static char *recRAM;	/* and the ptr to the blocks here */
diff --git a/libpcsxcore/ix86_64/ix86-64.c b/libpcsxcore/ix86_64/ix86-64.c
index a4399ab5..0582f351 100644
--- a/libpcsxcore/ix86_64/ix86-64.c
+++ b/libpcsxcore/ix86_64/ix86-64.c
@@ -46,8 +46,6 @@ s8  *x86Ptr;
 u8  *j8Ptr[32];
 u32 *j32Ptr[32];
 
-extern void SysPrintf(char *fmt, ...);
-
 void WriteRmOffset(x86IntRegType to, int offset)
 {
 	if( (to&7) == ESP ) {
diff --git a/libpcsxcore/mdec.h b/libpcsxcore/mdec.h
index 53ed93c7..efb0a9ca 100644
--- a/libpcsxcore/mdec.h
+++ b/libpcsxcore/mdec.h
@@ -28,11 +28,11 @@
 void mdecInit();
 void mdecWrite0(u32 data);
 void mdecWrite1(u32 data);
-u32  mdecRead0();
-u32  mdecRead1();
+u32 mdecRead0();
+u32 mdecRead1();
 void psxDma0(u32 madr, u32 bcr, u32 chcr);
 void psxDma1(u32 madr, u32 bcr, u32 chcr);
 void mdec1Interrupt();
-int  mdecFreeze(gzFile f, int Mode);
+int mdecFreeze(gzFile f, int Mode);
 
 #endif
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index c40723c1..5022d803 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -27,6 +27,7 @@
 #include "ppf.h"
 
 int Log = 0;
+FILE *emuLog = NULL;
 
 char CdromId[10] = "";
 char CdromLabel[33] = "";
@@ -374,7 +375,6 @@ static int PSXGetFileType(FILE *f) {
 	return INVALID_EXE;
 }
 
-/* TODO Error handling - return integer for each error case below, defined in an enum. Pass variable on return */
 int Load(char *ExePath) {
 	FILE *tmpFile;
 	EXE_HEADER tmpHead;
@@ -469,10 +469,10 @@ int SaveState(char *file) {
 
 	gzwrite(f, (void*)PcsxHeader, 32);
 
-	pMem = (unsigned char *) malloc(128*96*3);
+	pMem = (unsigned char *)malloc(128 * 96 * 3);
 	if (pMem == NULL) return -1;
 	GPU_getScreenPic(pMem);
-	gzwrite(f, pMem, 128*96*3);
+	gzwrite(f, pMem, 128 * 96 * 3);
 	free(pMem);
 
 	if (Config.HLE)
diff --git a/libpcsxcore/misc.h b/libpcsxcore/misc.h
index 960e7d28..73da9457 100644
--- a/libpcsxcore/misc.h
+++ b/libpcsxcore/misc.h
@@ -52,6 +52,8 @@ typedef struct {
 extern char CdromId[10];
 extern char CdromLabel[33];
 
+extern FILE *emuLog;
+
 int LoadCdrom();
 int LoadCdromFile(char *filename, EXE_HEADER *head);
 int CheckCdrom();
@@ -66,7 +68,4 @@ int RecvPcsxInfo();
 
 void trim(char *str);
 
-extern char *LabelAuthors;
-extern char *LabelGreets;
-
-#endif /* __MISC_H__ */
+#endif
diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 3d66de51..5f6369c9 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -24,8 +24,123 @@
 #include "plugins.h"
 #include "cdriso.h"
 
-char cdrfilename[MAXPATHLEN] = "";
-int cdOpenCase = 0;
+// FIXME: Stuff these into structs
+GPUupdateLace         GPU_updateLace;

+GPUinit               GPU_init;

+GPUshutdown           GPU_shutdown; 

+GPUconfigure          GPU_configure;

+GPUtest               GPU_test;

+GPUabout              GPU_about;

+GPUopen               GPU_open;

+GPUclose              GPU_close;

+GPUreadStatus         GPU_readStatus;

+GPUreadData           GPU_readData;

+GPUreadDataMem        GPU_readDataMem;

+GPUwriteStatus        GPU_writeStatus; 

+GPUwriteData          GPU_writeData;

+GPUwriteDataMem       GPU_writeDataMem;

+GPUdmaChain           GPU_dmaChain;

+GPUkeypressed         GPU_keypressed;

+GPUdisplayText        GPU_displayText;

+GPUmakeSnapshot       GPU_makeSnapshot;

+GPUfreeze             GPU_freeze;

+GPUgetScreenPic       GPU_getScreenPic;

+GPUshowScreenPic      GPU_showScreenPic;

+GPUclearDynarec       GPU_clearDynarec;

+
+CDRinit               CDR_init;

+CDRshutdown           CDR_shutdown;

+CDRopen               CDR_open;

+CDRclose              CDR_close; 

+CDRtest               CDR_test;

+CDRgetTN              CDR_getTN;

+CDRgetTD              CDR_getTD;

+CDRreadTrack          CDR_readTrack;

+CDRgetBuffer          CDR_getBuffer;

+CDRplay               CDR_play;

+CDRstop               CDR_stop;

+CDRgetStatus          CDR_getStatus;

+CDRgetDriveLetter     CDR_getDriveLetter;

+CDRgetBufferSub       CDR_getBufferSub;

+CDRconfigure          CDR_configure;

+CDRabout              CDR_about;

+CDRsetfilename        CDR_setfilename;

+
+SPUconfigure          SPU_configure;

+SPUabout              SPU_about;

+SPUinit               SPU_init;

+SPUshutdown           SPU_shutdown;

+SPUtest               SPU_test;

+SPUopen               SPU_open;

+SPUclose              SPU_close;

+SPUplaySample         SPU_playSample;

+SPUstartChannels1     SPU_startChannels1;

+SPUstartChannels2     SPU_startChannels2;

+SPUstopChannels1      SPU_stopChannels1;

+SPUstopChannels2      SPU_stopChannels2;

+SPUputOne             SPU_putOne;

+SPUgetOne             SPU_getOne;

+SPUsetAddr            SPU_setAddr;

+SPUsetPitch           SPU_setPitch;

+SPUsetVolumeL         SPU_setVolumeL;

+SPUsetVolumeR         SPU_setVolumeR;

+SPUwriteRegister      SPU_writeRegister;

+SPUreadRegister       SPU_readRegister;

+SPUwriteDMA           SPU_writeDMA;

+SPUreadDMA            SPU_readDMA;

+SPUwriteDMAMem        SPU_writeDMAMem;

+SPUreadDMAMem         SPU_readDMAMem;

+SPUplayADPCMchannel   SPU_playADPCMchannel;

+SPUfreeze             SPU_freeze;

+SPUregisterCallback   SPU_registerCallback;

+SPUasync              SPU_async;

+SPUplayCDDAchannel    SPU_playCDDAchannel;

+
+PADconfigure          PAD1_configure;

+PADabout              PAD1_about;

+PADinit               PAD1_init;

+PADshutdown           PAD1_shutdown;

+PADtest               PAD1_test;

+PADopen               PAD1_open;

+PADclose              PAD1_close;

+PADquery              PAD1_query;

+PADkeypressed         PAD1_keypressed;

+PADstartPoll          PAD1_startPoll;

+PADpoll               PAD1_poll;

+PADsetSensitive       PAD1_setSensitive;

+

+PADconfigure          PAD2_configure;

+PADabout              PAD2_about;

+PADinit               PAD2_init;

+PADshutdown           PAD2_shutdown;

+PADtest               PAD2_test;

+PADopen               PAD2_open;

+PADclose              PAD2_close;

+PADquery              PAD2_query;

+PADkeypressed         PAD2_keypressed;

+PADstartPoll          PAD2_startPoll;

+PADpoll               PAD2_poll;

+PADsetSensitive       PAD2_setSensitive;

+
+NETinit               NET_init;

+NETshutdown           NET_shutdown;

+NETopen               NET_open;

+NETclose              NET_close; 

+NETtest               NET_test;

+NETconfigure          NET_configure;

+NETabout              NET_about;

+NETpause              NET_pause;

+NETresume             NET_resume;

+NETqueryPlayer        NET_queryPlayer;

+NETsendData           NET_sendData;

+NETrecvData           NET_recvData;

+NETsendPadData        NET_sendPadData;

+NETrecvPadData        NET_recvPadData;

+NETsetInfo            NET_setInfo;

+NETkeypressed         NET_keypressed;

+
+char cdrfilename[MAXPATHLEN] = ""; // FIXME: cleanup
+int cdOpenCase = 0; // FIXME: cleanup
 
 #define CheckErr(func) \
     err = SysLibError(); \
@@ -635,7 +750,6 @@ void CALLBACK clearDynarec(void) {
 	psxCpu->Reset();
 }
 
-/* TODO If there's an error, need to notify user which plugin failed, rather than silently fail */
 int LoadPlugins() {
 	int ret;
 	char Plugin[MAXPATHLEN];
@@ -643,7 +757,7 @@ int LoadPlugins() {
 	ReleasePlugins();
 
 	if (cdrfilename[0] != '\0') {
-		imageReaderInit();
+		cdrIsoInit();
 	} else {
 		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Cdr);
 		if (LoadCDRplugin(Plugin) == -1) return -1;
@@ -669,7 +783,6 @@ int LoadPlugins() {
 		if (LoadNETplugin(Plugin) == -1) Config.UseNet = 0;
 	}
 
-	/* TODO Proper error code handling - report the appropriate error */
 	ret = CDR_init();
 	if (ret < 0) { SysMessage (_("Error initializing CD-ROM plugin: %d"), ret); return -1; }
 	ret = GPU_init();
@@ -691,15 +804,13 @@ int LoadPlugins() {
 }
 
 void ReleasePlugins() {
-	extern FILE *cdHandle;
-
 	if (Config.UseNet) {
 		int ret = NET_close();
 		if (ret < 0) Config.UseNet = 0;
 		NetOpened = 0;
 	}
 
-	if (hCDRDriver != NULL || cdHandle != NULL) CDR_shutdown();
+	if (hCDRDriver != NULL || cdrIsoActive()) CDR_shutdown();
 	if (hGPUDriver != NULL) GPU_shutdown();
 	if (hSPUDriver != NULL) SPU_shutdown();
 	if (hPAD1Driver != NULL) PAD1_shutdown();
diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index 297327a9..e2b78521 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -21,17 +21,16 @@
 #define __PLUGINS_H__

 

 #include "psxcommon.h"

-#include "spu.h"

 

 #ifndef _WIN32

 

 typedef void* HWND;

 #define CALLBACK

 

-typedef long (* GPUopen)(unsigned long *, char *, char *);

-typedef long (* SPUopen)(void);

-typedef long (* PADopen)(unsigned long *);

-typedef long (* NETopen)(unsigned long *);

+typedef long (*GPUopen)(unsigned long *, char *, char *);

+typedef long (*SPUopen)(void);

+typedef long (*PADopen)(unsigned long *);

+typedef long (*NETopen)(unsigned long *);

 

 #else

 

@@ -43,20 +42,22 @@ typedef long (CALLBACK* PADopen)(HWND);
 typedef long (CALLBACK* NETopen)(HWND);

 

 #endif

+
+#include "spu.h"

 

 #include "psemu_plugin_defs.h"

 #include "decode_xa.h"

 

-int  LoadPlugins();

+int LoadPlugins();

 void ReleasePlugins();

-int  OpenPlugins();

+int OpenPlugins();

 void ClosePlugins();

 

 typedef unsigned long (CALLBACK* PSEgetLibType)(void);

 typedef unsigned long (CALLBACK* PSEgetLibVersion)(void);

 typedef char *(CALLBACK* PSEgetLibName)(void);

 

-///GPU PLUGIN STUFF 

+// GPU Functions

 typedef long (CALLBACK* GPUinit)(void);

 typedef long (CALLBACK* GPUshutdown)(void);

 typedef long (CALLBACK* GPUclose)(void);

@@ -85,33 +86,31 @@ typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);
 typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);

 typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));

 

-//plugin stuff From Shadow

-// *** walking in the valley of your darking soul i realize that i was alone

-//Gpu function pointers

-GPUupdateLace    GPU_updateLace;

-GPUinit          GPU_init;

-GPUshutdown      GPU_shutdown; 

-GPUconfigure     GPU_configure;

-GPUtest          GPU_test;

-GPUabout         GPU_about;

-GPUopen          GPU_open;

-GPUclose         GPU_close;

-GPUreadStatus    GPU_readStatus;

-GPUreadData      GPU_readData;

-GPUreadDataMem   GPU_readDataMem;

-GPUwriteStatus   GPU_writeStatus; 

-GPUwriteData     GPU_writeData;

-GPUwriteDataMem  GPU_writeDataMem;

-GPUdmaChain      GPU_dmaChain;

-GPUkeypressed    GPU_keypressed;

-GPUdisplayText   GPU_displayText;

-GPUmakeSnapshot  GPU_makeSnapshot;

-GPUfreeze        GPU_freeze;

-GPUgetScreenPic  GPU_getScreenPic;

-GPUshowScreenPic GPU_showScreenPic;

-GPUclearDynarec  GPU_clearDynarec;

-

-//cd rom plugin ;)

+// GPU function pointers

+extern GPUupdateLace    GPU_updateLace;

+extern GPUinit          GPU_init;

+extern GPUshutdown      GPU_shutdown; 

+extern GPUconfigure     GPU_configure;

+extern GPUtest          GPU_test;

+extern GPUabout         GPU_about;

+extern GPUopen          GPU_open;

+extern GPUclose         GPU_close;

+extern GPUreadStatus    GPU_readStatus;

+extern GPUreadData      GPU_readData;

+extern GPUreadDataMem   GPU_readDataMem;

+extern GPUwriteStatus   GPU_writeStatus; 

+extern GPUwriteData     GPU_writeData;

+extern GPUwriteDataMem  GPU_writeDataMem;

+extern GPUdmaChain      GPU_dmaChain;

+extern GPUkeypressed    GPU_keypressed;

+extern GPUdisplayText   GPU_displayText;

+extern GPUmakeSnapshot  GPU_makeSnapshot;

+extern GPUfreeze        GPU_freeze;

+extern GPUgetScreenPic  GPU_getScreenPic;

+extern GPUshowScreenPic GPU_showScreenPic;

+extern GPUclearDynarec  GPU_clearDynarec;

+

+// CD-ROM Functions

 typedef long (CALLBACK* CDRinit)(void);

 typedef long (CALLBACK* CDRshutdown)(void);

 typedef long (CALLBACK* CDRopen)(void);

@@ -144,27 +143,27 @@ struct SubQ {
 	char res1[72];

 };

 typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);

-

-//cd rom function pointers 

-CDRinit               CDR_init;

-CDRshutdown           CDR_shutdown;

-CDRopen               CDR_open;

-CDRclose              CDR_close; 

-CDRtest               CDR_test;

-CDRgetTN              CDR_getTN;

-CDRgetTD              CDR_getTD;

-CDRreadTrack          CDR_readTrack;

-CDRgetBuffer          CDR_getBuffer;

-CDRplay               CDR_play;

-CDRstop               CDR_stop;

-CDRgetStatus          CDR_getStatus;

-CDRgetDriveLetter     CDR_getDriveLetter;

-CDRgetBufferSub       CDR_getBufferSub;

-CDRconfigure          CDR_configure;

-CDRabout              CDR_about;

-CDRsetfilename        CDR_setfilename;

-

-// spu plugin

+
+// CD-ROM function pointers

+extern CDRinit               CDR_init;

+extern CDRshutdown           CDR_shutdown;

+extern CDRopen               CDR_open;

+extern CDRclose              CDR_close; 

+extern CDRtest               CDR_test;

+extern CDRgetTN              CDR_getTN;

+extern CDRgetTD              CDR_getTD;

+extern CDRreadTrack          CDR_readTrack;

+extern CDRgetBuffer          CDR_getBuffer;

+extern CDRplay               CDR_play;

+extern CDRstop               CDR_stop;

+extern CDRgetStatus          CDR_getStatus;

+extern CDRgetDriveLetter     CDR_getDriveLetter;

+extern CDRgetBufferSub       CDR_getBufferSub;

+extern CDRconfigure          CDR_configure;

+extern CDRabout              CDR_about;

+extern CDRsetfilename        CDR_setfilename;

+

+// SPU Functions

 typedef long (CALLBACK* SPUinit)(void);				

 typedef long (CALLBACK* SPUshutdown)(void);	

 typedef long (CALLBACK* SPUclose)(void);			

@@ -179,7 +178,6 @@ typedef void (CALLBACK* SPUsetAddr)(unsigned char, unsigned short);
 typedef void (CALLBACK* SPUsetPitch)(unsigned char, unsigned short);

 typedef void (CALLBACK* SPUsetVolumeL)(unsigned char, short);

 typedef void (CALLBACK* SPUsetVolumeR)(unsigned char, short);

-//psemu pro 2 functions from now..

 typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short);

 typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);

 typedef void (CALLBACK* SPUwriteDMA)(unsigned short);

@@ -204,39 +202,38 @@ typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *);
 typedef void (CALLBACK* SPUasync)(uint32_t);

 typedef void (CALLBACK* SPUplayCDDAchannel)(short *, int);

 

-//SPU POINTERS

-SPUconfigure        SPU_configure;

-SPUabout            SPU_about;

-SPUinit             SPU_init;

-SPUshutdown         SPU_shutdown;

-SPUtest             SPU_test;

-SPUopen             SPU_open;

-SPUclose            SPU_close;

-SPUplaySample       SPU_playSample;

-SPUstartChannels1   SPU_startChannels1;

-SPUstartChannels2   SPU_startChannels2;

-SPUstopChannels1    SPU_stopChannels1;

-SPUstopChannels2    SPU_stopChannels2;

-SPUputOne           SPU_putOne;

-SPUgetOne           SPU_getOne;

-SPUsetAddr          SPU_setAddr;

-SPUsetPitch         SPU_setPitch;

-SPUsetVolumeL       SPU_setVolumeL;

-SPUsetVolumeR       SPU_setVolumeR;

-SPUwriteRegister    SPU_writeRegister;

-SPUreadRegister     SPU_readRegister;

-SPUwriteDMA         SPU_writeDMA;

-SPUreadDMA          SPU_readDMA;

-SPUwriteDMAMem      SPU_writeDMAMem;

-SPUreadDMAMem       SPU_readDMAMem;

-SPUplayADPCMchannel SPU_playADPCMchannel;

-SPUfreeze           SPU_freeze;

-SPUregisterCallback SPU_registerCallback;

-SPUasync            SPU_async;

-SPUplayCDDAchannel  SPU_playCDDAchannel;

+// SPU function pointers

+extern SPUconfigure        SPU_configure;

+extern SPUabout            SPU_about;

+extern SPUinit             SPU_init;

+extern SPUshutdown         SPU_shutdown;

+extern SPUtest             SPU_test;

+extern SPUopen             SPU_open;

+extern SPUclose            SPU_close;

+extern SPUplaySample       SPU_playSample;

+extern SPUstartChannels1   SPU_startChannels1;

+extern SPUstartChannels2   SPU_startChannels2;

+extern SPUstopChannels1    SPU_stopChannels1;

+extern SPUstopChannels2    SPU_stopChannels2;

+extern SPUputOne           SPU_putOne;

+extern SPUgetOne           SPU_getOne;

+extern SPUsetAddr          SPU_setAddr;

+extern SPUsetPitch         SPU_setPitch;

+extern SPUsetVolumeL       SPU_setVolumeL;

+extern SPUsetVolumeR       SPU_setVolumeR;

+extern SPUwriteRegister    SPU_writeRegister;

+extern SPUreadRegister     SPU_readRegister;

+extern SPUwriteDMA         SPU_writeDMA;

+extern SPUreadDMA          SPU_readDMA;

+extern SPUwriteDMAMem      SPU_writeDMAMem;

+extern SPUreadDMAMem       SPU_readDMAMem;

+extern SPUplayADPCMchannel SPU_playADPCMchannel;

+extern SPUfreeze           SPU_freeze;

+extern SPUregisterCallback SPU_registerCallback;

+extern SPUasync            SPU_async;

+extern SPUplayCDDAchannel  SPU_playCDDAchannel;

 

 // PAD Functions

-

 typedef long (CALLBACK* PADconfigure)(void);

 typedef void (CALLBACK* PADabout)(void);

 typedef long (CALLBACK* PADinit)(long);

@@ -249,35 +246,34 @@ typedef unsigned char (CALLBACK* PADstartPoll)(int);
 typedef unsigned char (CALLBACK* PADpoll)(unsigned char);

 typedef void (CALLBACK* PADsetSensitive)(int);

 

-//PAD POINTERS

-PADconfigure        PAD1_configure;

-PADabout            PAD1_about;

-PADinit             PAD1_init;

-PADshutdown         PAD1_shutdown;

-PADtest             PAD1_test;

-PADopen             PAD1_open;

-PADclose            PAD1_close;

-PADquery			PAD1_query;

-PADkeypressed		PAD1_keypressed;

-PADstartPoll        PAD1_startPoll;

-PADpoll             PAD1_poll;

-PADsetSensitive     PAD1_setSensitive;

-

-PADconfigure        PAD2_configure;

-PADabout            PAD2_about;

-PADinit             PAD2_init;

-PADshutdown         PAD2_shutdown;

-PADtest             PAD2_test;

-PADopen             PAD2_open;

-PADclose            PAD2_close;

-PADquery            PAD2_query;

-PADkeypressed		PAD2_keypressed;

-PADstartPoll        PAD2_startPoll;

-PADpoll             PAD2_poll;

-PADsetSensitive     PAD2_setSensitive;

-

-// NET plugin

-

+// PAD function pointers

+extern PADconfigure        PAD1_configure;

+extern PADabout            PAD1_about;

+extern PADinit             PAD1_init;

+extern PADshutdown         PAD1_shutdown;

+extern PADtest             PAD1_test;

+extern PADopen             PAD1_open;

+extern PADclose            PAD1_close;

+extern PADquery            PAD1_query;

+extern PADkeypressed       PAD1_keypressed;

+extern PADstartPoll        PAD1_startPoll;

+extern PADpoll             PAD1_poll;

+extern PADsetSensitive     PAD1_setSensitive;

+

+extern PADconfigure        PAD2_configure;

+extern PADabout            PAD2_about;

+extern PADinit             PAD2_init;

+extern PADshutdown         PAD2_shutdown;

+extern PADtest             PAD2_test;

+extern PADopen             PAD2_open;

+extern PADclose            PAD2_close;

+extern PADquery            PAD2_query;

+extern PADkeypressed       PAD2_keypressed;

+extern PADstartPoll        PAD2_startPoll;

+extern PADpoll             PAD2_poll;

+extern PADsetSensitive     PAD2_setSensitive;

+

+// NET Functions

 typedef long (CALLBACK* NETinit)(void);

 typedef long (CALLBACK* NETshutdown)(void);

 typedef long (CALLBACK* NETclose)(void);

@@ -312,24 +308,23 @@ typedef struct {
 typedef long (CALLBACK* NETsetInfo)(netInfo *);

 typedef long (CALLBACK* NETkeypressed)(int);

 

-

 // NET function pointers 

-NETinit               NET_init;

-NETshutdown           NET_shutdown;

-NETopen               NET_open;

-NETclose              NET_close; 

-NETtest               NET_test;

-NETconfigure          NET_configure;

-NETabout              NET_about;

-NETpause              NET_pause;

-NETresume             NET_resume;

-NETqueryPlayer        NET_queryPlayer;

-NETsendData           NET_sendData;

-NETrecvData           NET_recvData;

-NETsendPadData        NET_sendPadData;

-NETrecvPadData        NET_recvPadData;

-NETsetInfo            NET_setInfo;

-NETkeypressed         NET_keypressed;

+extern NETinit               NET_init;

+extern NETshutdown           NET_shutdown;

+extern NETopen               NET_open;

+extern NETclose              NET_close; 

+extern NETtest               NET_test;

+extern NETconfigure          NET_configure;

+extern NETabout              NET_about;

+extern NETpause              NET_pause;

+extern NETresume             NET_resume;

+extern NETqueryPlayer        NET_queryPlayer;

+extern NETsendData           NET_sendData;

+extern NETrecvData           NET_recvData;

+extern NETsendPadData        NET_sendPadData;

+extern NETrecvPadData        NET_recvPadData;

+extern NETsetInfo            NET_setInfo;

+extern NETkeypressed         NET_keypressed;

 

 int LoadCDRplugin(char *CDRdll);

 int LoadGPUplugin(char *GPUdll);

@@ -340,6 +335,6 @@ int LoadNETplugin(char *NETdll);
 

 void CALLBACK clearDynarec(void);

 

-extern char cdrfilename[MAXPATHLEN];

+extern char cdrfilename[MAXPATHLEN]; // FIXME: cleanup

 

-#endif /* __PLUGINS_H__ */

+#endif

diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c
index ebda4f8a..45c8733c 100644
--- a/libpcsxcore/ppf.c
+++ b/libpcsxcore/ppf.c
@@ -22,7 +22,6 @@
 #include "psxcommon.h"
 #include "ppf.h"
 #include "cdrom.h"
-#include "cdriso.h"
 
 typedef struct tagPPF_DATA {
 	s32					addr;
diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c
new file mode 100644
index 00000000..a97f3dc2
--- /dev/null
+++ b/libpcsxcore/psxcommon.c
@@ -0,0 +1,22 @@
+/***************************************************************************
+ *   Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ ***************************************************************************/
+
+#include "psxcommon.h"
+
+PcsxConfig Config;
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 931cdc93..1261aabd 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-/* System includes */
+// System includes
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -40,7 +40,7 @@
 #include <assert.h>
 #include <zlib.h>
 
-/* Define types */
+// Define types
 typedef int8_t s8;
 typedef int16_t s16;
 typedef int32_t s32;
@@ -53,7 +53,7 @@ typedef uint32_t u32;
 typedef uint64_t u64;
 typedef uintptr_t uptr;
 
-/* Local includes */
+// Local includes
 #include "system.h"
 #include "debug.h"
 
@@ -62,7 +62,7 @@ typedef uintptr_t uptr;
 #endif
 #define __inline inline
 
-/* Enables NLS/internationalization if active */
+// Enables NLS/internationalization if active
 #ifdef ENABLE_NLS
 
 #include <libintl.h>
@@ -102,7 +102,7 @@ typedef struct {
 	long Sio;
 	long Mdec;
 	long PsxAuto;
-	long PsxType;		/* NTSC or PAL */
+	long PsxType; // PSX_TYPE_NTSC or PSX_TYPE_PAL
 	long Cdda;
 	long HLE;
 	long Cpu;
@@ -117,7 +117,7 @@ typedef struct {
 #endif
 } PcsxConfig;
 
-PcsxConfig Config;
+extern PcsxConfig Config;
 
 extern int StatesC;
 extern int cdOpenCase;
@@ -134,14 +134,13 @@ extern int NetOpened;
 #define PSXCLK	33868800	/* 33.8688 Mhz */
 
 enum {
-	BIOS_USER_DEFINED,
+	BIOS_USER_DEFINED = 0,
 	BIOS_HLE
-};	/* BIOS Types */
+}; // BIOS Types
 
 enum {
-	PSX_TYPE_NTSC,
+	PSX_TYPE_NTSC = 0,
 	PSX_TYPE_PAL
-};	/* PSX Type */
+}; // PSX Type
 
-
-#endif /* __PSXCOMMON_H__ */
+#endif
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 972717c1..dd68427d 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -79,6 +79,8 @@ static Rcnt rcnts[ CounterQuantity ];
 static u32 hSyncCount;
 static u32 spuSyncCount;
 
+u32 psxNextCounter, psxNextsCounter;
+
 /******************************************************************************/
 
 static inline
diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h
index 30ea6954..137d13ef 100644
--- a/libpcsxcore/psxcounters.h
+++ b/libpcsxcore/psxcounters.h
@@ -25,19 +25,19 @@
 #include "psxmem.h"
 #include "plugins.h"
 
-u32 psxNextCounter, psxNextsCounter;
+extern u32 psxNextCounter, psxNextsCounter;
 
 void psxRcntInit();
 void psxRcntUpdate();
 
-void psxRcntWcount( u32 index, u32 value );
-void psxRcntWmode( u32 index, u32 value );
-void psxRcntWtarget( u32 index, u32 value );
+void psxRcntWcount(u32 index, u32 value);
+void psxRcntWmode(u32 index, u32 value);
+void psxRcntWtarget(u32 index, u32 value);
 
-u32 psxRcntRcount( u32 index );
-u32 psxRcntRmode( u32 index );
-u32 psxRcntRtarget( u32 index );
+u32 psxRcntRcount(u32 index);
+u32 psxRcntRmode(u32 index);
+u32 psxRcntRtarget(u32 index);
 
-s32 psxRcntFreeze( gzFile f, s32 Mode );
+s32 psxRcntFreeze(gzFile f, s32 Mode);
 
-#endif // __PSXCOUNTERS_H__
+#endif
diff --git a/libpcsxcore/psxdma.h b/libpcsxcore/psxdma.h
index 04457268..636a4bdb 100644
--- a/libpcsxcore/psxdma.h
+++ b/libpcsxcore/psxdma.h
@@ -27,14 +27,14 @@
 
 #define GPUDMA_INT(eCycle) { \
 	psxRegs.interrupt |= 0x01000000; \
-	psxRegs.intCycle[3+24+1] = eCycle; \
-	psxRegs.intCycle[3+24] = psxRegs.cycle; \
+	psxRegs.intCycle[3 + 24 + 1] = eCycle; \
+	psxRegs.intCycle[3 + 24] = psxRegs.cycle; \
 }
 
 #define MDECOUTDMA_INT(eCycle) { \
 	psxRegs.interrupt |= 0x02000000; \
-	psxRegs.intCycle[5+24+1] = eCycle; \
-	psxRegs.intCycle[5+24] = psxRegs.cycle; \
+	psxRegs.intCycle[5 + 24 + 1] = eCycle; \
+	psxRegs.intCycle[5 + 24] = psxRegs.cycle; \
 }
 
 void psxDma2(u32 madr, u32 bcr, u32 chcr);
@@ -43,4 +43,4 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr);
 void psxDma6(u32 madr, u32 bcr, u32 chcr);
 void gpuInterrupt();
 
-#endif /* __PSXDMA_H__ */
+#endif
diff --git a/libpcsxcore/psxhle.h b/libpcsxcore/psxhle.h
index 1c100ac7..70d58397 100644
--- a/libpcsxcore/psxhle.h
+++ b/libpcsxcore/psxhle.h
@@ -26,4 +26,4 @@
 
 extern void (*psxHLEt[256])();
 
-#endif /* __PSXHLE_H__ */
+#endif
diff --git a/libpcsxcore/psxhw.h b/libpcsxcore/psxhw.h
index 43f70763..eb3bad7a 100644
--- a/libpcsxcore/psxhw.h
+++ b/libpcsxcore/psxhw.h
@@ -54,20 +54,19 @@
 #define HW_DMA_ICR   (psxHu32ref(0x10f4))
 
 #define	DMA_INTERRUPT(n) \
-	if (SWAPu32(HW_DMA_ICR) & (1 << (16 + n))) { \
-		HW_DMA_ICR|= SWAP32(1 << (24 + n)); \
-		psxHu32ref(0x1070) |= SWAP32(8);                \
-		psxRegs.interrupt|= 0x80000000;                 \
+	if (SWAPu32(HW_DMA_ICR) & (1 << (16 + n))) {    \
+		HW_DMA_ICR |= SWAP32(1 << (24 + n));        \
+		psxHu32ref(0x1070) |= SWAP32(8);            \
+		psxRegs.interrupt |= 0x80000000;            \
 	}
 
-
 void psxHwReset();
-u8   psxHwRead8 (u32 add);
-u16  psxHwRead16(u32 add);
-u32  psxHwRead32(u32 add);
-void psxHwWrite8 (u32 add, u8  value);
+u8 psxHwRead8(u32 add);
+u16 psxHwRead16(u32 add);
+u32 psxHwRead32(u32 add);
+void psxHwWrite8(u32 add, u8  value);
 void psxHwWrite16(u32 add, u16 value);
 void psxHwWrite32(u32 add, u32 value);
 int psxHwFreeze(gzFile f, int Mode);
 
-#endif /* __PSXHW_H__ */
+#endif
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 053fc58f..ff053ca9 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -30,6 +30,14 @@
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
+s8 *psxM = NULL;
+s8 *psxP = NULL;
+s8 *psxR = NULL;
+s8 *psxH = NULL;
+
+u8 **psxMemWLUT = NULL;
+u8 **psxMemRLUT = NULL;
+
 /*  Playstation Memory Map (from Playstation doc by Joshua Walker)
 0x0000_0000-0x0000_ffff		Kernel (64K)	
 0x0001_0000-0x001f_ffff		User Memory (1.9 Meg)	
diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h
index 0af77f5c..535addba 100644
--- a/libpcsxcore/psxmem.h
+++ b/libpcsxcore/psxmem.h
@@ -24,11 +24,11 @@
 
 #if defined(__BIGENDIAN__)
 
-#define _SWAP16(b) ((((unsigned char*)&(b))[0]&0xff) | (((unsigned char*)&(b))[1]&0xff)<<8)
-#define _SWAP32(b) ((((unsigned char*)&(b))[0]&0xff) | ((((unsigned char*)&(b))[1]&0xff)<<8) | ((((unsigned char*)&(b))[2]&0xff)<<16) | (((unsigned char*)&(b))[3]<<24))
+#define _SWAP16(b) ((((unsigned char *)&(b))[0] & 0xff) | (((unsigned char *)&(b))[1] & 0xff) << 8)
+#define _SWAP32(b) ((((unsigned char *)&(b))[0] & 0xff) | ((((unsigned char *)&(b))[1] & 0xff) << 8) | ((((unsigned char *)&(b))[2] & 0xff) << 16) | (((unsigned char *)&(b))[3] << 24))
 
-#define SWAP16(v) ((((v)&0xff00)>>8) +(((v)&0xff)<<8))
-#define SWAP32(v) ((((v)&0xff000000ul)>>24) + (((v)&0xff0000ul)>>8) + (((v)&0xff00ul)<<8) +(((v)&0xfful)<<24))
+#define SWAP16(v) ((((v) & 0xff00) >> 8) +(((v) & 0xff) << 8))
+#define SWAP32(v) ((((v) & 0xff000000ul) >> 24) + (((v) & 0xff0000ul) >> 8) + (((v) & 0xff00ul)<<8) +(((v) & 0xfful) << 24))
 #define SWAPu32(v) SWAP32((u32)(v))
 #define SWAPs32(v) SWAP32((s32)(v))
 
@@ -45,94 +45,93 @@
 
 #endif
 
-s8 *psxM;
+extern s8 *psxM;
 #define psxMs8(mem)		psxM[(mem) & 0x1fffff]
-#define psxMs16(mem)	(SWAP16(*(s16*)&psxM[(mem) & 0x1fffff]))
-#define psxMs32(mem)	(SWAP32(*(s32*)&psxM[(mem) & 0x1fffff]))
-#define psxMu8(mem)		(*(u8*)&psxM[(mem) & 0x1fffff])
-#define psxMu16(mem)	(SWAP16(*(u16*)&psxM[(mem) & 0x1fffff]))
-#define psxMu32(mem)	(SWAP32(*(u32*)&psxM[(mem) & 0x1fffff]))
+#define psxMs16(mem)	(SWAP16(*(s16 *)&psxM[(mem) & 0x1fffff]))
+#define psxMs32(mem)	(SWAP32(*(s32 *)&psxM[(mem) & 0x1fffff]))
+#define psxMu8(mem)		(*(u8 *)&psxM[(mem) & 0x1fffff])
+#define psxMu16(mem)	(SWAP16(*(u16 *)&psxM[(mem) & 0x1fffff]))
+#define psxMu32(mem)	(SWAP32(*(u32 *)&psxM[(mem) & 0x1fffff]))
 
 #define psxMs8ref(mem)	psxM[(mem) & 0x1fffff]
-#define psxMs16ref(mem)	(*(s16*)&psxM[(mem) & 0x1fffff])
-#define psxMs32ref(mem)	(*(s32*)&psxM[(mem) & 0x1fffff])
-#define psxMu8ref(mem)	(*(u8*) &psxM[(mem) & 0x1fffff])
-#define psxMu16ref(mem)	(*(u16*)&psxM[(mem) & 0x1fffff])
-#define psxMu32ref(mem)	(*(u32*)&psxM[(mem) & 0x1fffff])
+#define psxMs16ref(mem)	(*(s16 *)&psxM[(mem) & 0x1fffff])
+#define psxMs32ref(mem)	(*(s32 *)&psxM[(mem) & 0x1fffff])
+#define psxMu8ref(mem)	(*(u8 *)&psxM[(mem) & 0x1fffff])
+#define psxMu16ref(mem)	(*(u16 *)&psxM[(mem) & 0x1fffff])
+#define psxMu32ref(mem)	(*(u32 *)&psxM[(mem) & 0x1fffff])
 
-s8 *psxP;
+extern s8 *psxP;
 #define psxPs8(mem)	    psxP[(mem) & 0xffff]
-#define psxPs16(mem)	(SWAP16(*(s16*)&psxP[(mem) & 0xffff]))
-#define psxPs32(mem)	(SWAP32(*(s32*)&psxP[(mem) & 0xffff]))
-#define psxPu8(mem)		(*(u8*) &psxP[(mem) & 0xffff])
-#define psxPu16(mem)	(SWAP16(*(u16*)&psxP[(mem) & 0xffff]))
-#define psxPu32(mem)	(SWAP32(*(u32*)&psxP[(mem) & 0xffff]))
+#define psxPs16(mem)	(SWAP16(*(s16 *)&psxP[(mem) & 0xffff]))
+#define psxPs32(mem)	(SWAP32(*(s32 *)&psxP[(mem) & 0xffff]))
+#define psxPu8(mem)		(*(u8 *)&psxP[(mem) & 0xffff])
+#define psxPu16(mem)	(SWAP16(*(u16 *)&psxP[(mem) & 0xffff]))
+#define psxPu32(mem)	(SWAP32(*(u32 *)&psxP[(mem) & 0xffff]))
 
 #define psxPs8ref(mem)	psxP[(mem) & 0xffff]
-#define psxPs16ref(mem)	(*(s16*)&psxP[(mem) & 0xffff])
-#define psxPs32ref(mem)	(*(s32*)&psxP[(mem) & 0xffff])
-#define psxPu8ref(mem)	(*(u8*) &psxP[(mem) & 0xffff])
-#define psxPu16ref(mem)	(*(u16*)&psxP[(mem) & 0xffff])
-#define psxPu32ref(mem)	(*(u32*)&psxP[(mem) & 0xffff])
+#define psxPs16ref(mem)	(*(s16 *)&psxP[(mem) & 0xffff])
+#define psxPs32ref(mem)	(*(s32 *)&psxP[(mem) & 0xffff])
+#define psxPu8ref(mem)	(*(u8 *)&psxP[(mem) & 0xffff])
+#define psxPu16ref(mem)	(*(u16 *)&psxP[(mem) & 0xffff])
+#define psxPu32ref(mem)	(*(u32 *)&psxP[(mem) & 0xffff])
 
-s8 *psxR;
+extern s8 *psxR;
 #define psxRs8(mem)		psxR[(mem) & 0x7ffff]
-#define psxRs16(mem)	(SWAP16(*(s16*)&psxR[(mem) & 0x7ffff]))
-#define psxRs32(mem)	(SWAP32(*(s32*)&psxR[(mem) & 0x7ffff]))
+#define psxRs16(mem)	(SWAP16(*(s16 *)&psxR[(mem) & 0x7ffff]))
+#define psxRs32(mem)	(SWAP32(*(s32 *)&psxR[(mem) & 0x7ffff]))
 #define psxRu8(mem)		(*(u8* )&psxR[(mem) & 0x7ffff])
-#define psxRu16(mem)	(SWAP16(*(u16*)&psxR[(mem) & 0x7ffff]))
-#define psxRu32(mem)	(SWAP32(*(u32*)&psxR[(mem) & 0x7ffff]))
+#define psxRu16(mem)	(SWAP16(*(u16 *)&psxR[(mem) & 0x7ffff]))
+#define psxRu32(mem)	(SWAP32(*(u32 *)&psxR[(mem) & 0x7ffff]))
 
 #define psxRs8ref(mem)	psxR[(mem) & 0x7ffff]
 #define psxRs16ref(mem)	(*(s16*)&psxR[(mem) & 0x7ffff])
 #define psxRs32ref(mem)	(*(s32*)&psxR[(mem) & 0x7ffff])
-#define psxRu8ref(mem)	(*(u8* )&psxR[(mem) & 0x7ffff])
+#define psxRu8ref(mem)	(*(u8 *)&psxR[(mem) & 0x7ffff])
 #define psxRu16ref(mem)	(*(u16*)&psxR[(mem) & 0x7ffff])
 #define psxRu32ref(mem)	(*(u32*)&psxR[(mem) & 0x7ffff])
 
-s8 *psxH;
+extern s8 *psxH;
 #define psxHs8(mem)		psxH[(mem) & 0xffff]
-#define psxHs16(mem)	(SWAP16(*(s16*)&psxH[(mem) & 0xffff]))
-#define psxHs32(mem)	(SWAP32(*(s32*)&psxH[(mem) & 0xffff]))
-#define psxHu8(mem)		(*(u8*) &psxH[(mem) & 0xffff])
-#define psxHu16(mem)	(SWAP16(*(u16*)&psxH[(mem) & 0xffff]))
-#define psxHu32(mem)	(SWAP32(*(u32*)&psxH[(mem) & 0xffff]))
+#define psxHs16(mem)	(SWAP16(*(s16 *)&psxH[(mem) & 0xffff]))
+#define psxHs32(mem)	(SWAP32(*(s32 *)&psxH[(mem) & 0xffff]))
+#define psxHu8(mem)		(*(u8 *)&psxH[(mem) & 0xffff])
+#define psxHu16(mem)	(SWAP16(*(u16 *)&psxH[(mem) & 0xffff]))
+#define psxHu32(mem)	(SWAP32(*(u32 *)&psxH[(mem) & 0xffff]))
 
 #define psxHs8ref(mem)	psxH[(mem) & 0xffff]
-#define psxHs16ref(mem)	(*(s16*)&psxH[(mem) & 0xffff])
-#define psxHs32ref(mem)	(*(s32*)&psxH[(mem) & 0xffff])
-#define psxHu8ref(mem)	(*(u8*) &psxH[(mem) & 0xffff])
-#define psxHu16ref(mem)	(*(u16*)&psxH[(mem) & 0xffff])
-#define psxHu32ref(mem)	(*(u32*)&psxH[(mem) & 0xffff])
+#define psxHs16ref(mem)	(*(s16 *)&psxH[(mem) & 0xffff])
+#define psxHs32ref(mem)	(*(s32 *)&psxH[(mem) & 0xffff])
+#define psxHu8ref(mem)	(*(u8 *)&psxH[(mem) & 0xffff])
+#define psxHu16ref(mem)	(*(u16 *)&psxH[(mem) & 0xffff])
+#define psxHu32ref(mem)	(*(u32 *)&psxH[(mem) & 0xffff])
 
-u8** psxMemWLUT;
-u8** psxMemRLUT;
+extern u8 **psxMemWLUT;
+extern u8 **psxMemRLUT;
 
 #define PSXM(mem)		(psxMemRLUT[(mem) >> 16] == 0 ? NULL : (u8*)(psxMemRLUT[(mem) >> 16] + ((mem) & 0xffff)))
 #define PSXMs8(mem)		(*(s8 *)PSXM(mem))
-#define PSXMs16(mem)	(SWAP16(*(s16*)PSXM(mem)))
-#define PSXMs32(mem)	(SWAP32(*(s32*)PSXM(mem)))
+#define PSXMs16(mem)	(SWAP16(*(s16 *)PSXM(mem)))
+#define PSXMs32(mem)	(SWAP32(*(s32 *)PSXM(mem)))
 #define PSXMu8(mem)		(*(u8 *)PSXM(mem))
-#define PSXMu16(mem)	(SWAP16(*(u16*)PSXM(mem)))
-#define PSXMu32(mem)	(SWAP32(*(u32*)PSXM(mem)))
+#define PSXMu16(mem)	(SWAP16(*(u16 *)PSXM(mem)))
+#define PSXMu32(mem)	(SWAP32(*(u32 *)PSXM(mem)))
 
-#define PSXMu32ref(mem)	(*(u32*)PSXM(mem))
+#define PSXMu32ref(mem)	(*(u32 *)PSXM(mem))
 
 #if !defined(PSXREC) && (defined(__x86_64__) || defined(__i386__) || defined(__ppc__)) && !defined(NOPSXREC)
 #define PSXREC
 #endif
 
-int  psxMemInit();
+int psxMemInit();
 void psxMemReset();
 void psxMemShutdown();
 
-u8   psxMemRead8 (u32 mem);
-u16  psxMemRead16(u32 mem);
-u32  psxMemRead32(u32 mem);
+u8 psxMemRead8 (u32 mem);
+u16 psxMemRead16(u32 mem);
+u32 psxMemRead32(u32 mem);
 void psxMemWrite8 (u32 mem, u8 value);
 void psxMemWrite16(u32 mem, u16 value);
 void psxMemWrite32(u32 mem, u32 value);
 void *psxMemPointer(u32 mem);
 
-#endif /* __PSXMEMORY_H__ */
-
+#endif
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 24d12adf..3811443f 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -49,8 +49,8 @@ int psxInit() {
 }
 
 void psxReset() {
-	FreeCheatSearchResults();
-	FreeCheatSearchMem();
+	FreeCheatSearchResults(); // FIXME: cleanup
+	FreeCheatSearchMem(); // FIXME: cleanup
 
 	psxCpu->Reset();
 
@@ -81,11 +81,11 @@ void psxShutdown() {
 
 	psxCpu->Shutdown();
 
-	ClearAllCheats();
-	FreeCheatSearchResults();
-	FreeCheatSearchMem();
+	ClearAllCheats(); // FIXME: cleanup
+	FreeCheatSearchResults(); // FIXME: cleanup
+	FreeCheatSearchMem(); // FIXME: cleanup
 
-	FreePPFCache();
+	FreePPFCache(); // FIXME: cleanup
 }
 
 void psxException(u32 code, u32 bd) {
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 8a91ec2a..81dd3fec 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -38,8 +38,8 @@ unsigned short BaudReg;
 
 static unsigned int bufcount;
 static unsigned int parp;
-static unsigned int mcdst,rdwr;
-static unsigned char adrH,adrL;
+static unsigned int mcdst, rdwr;
+static unsigned char adrH, adrL;
 static unsigned int padst;
 
 char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
@@ -48,8 +48,8 @@ char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
 // 4us * 8bits = ((PSXCLK / 1000000) * 32) / BIAS; (linuzappz)
 #define SIO_INT() { \
 	if (!Config.Sio) { \
-		psxRegs.interrupt|= 0x80; \
-		psxRegs.intCycle[7+1] = 200; /*270;*/ \
+		psxRegs.interrupt |= 0x80; \
+		psxRegs.intCycle[7 + 1] = 200; /*270;*/ \
 		psxRegs.intCycle[7] = psxRegs.cycle; \
 	} \
 }
diff --git a/libpcsxcore/spu.h b/libpcsxcore/spu.h
index 27200255..1adb7148 100644
--- a/libpcsxcore/spu.h
+++ b/libpcsxcore/spu.h
@@ -25,10 +25,6 @@
 #include "r3000a.h"
 #include "psxmem.h"
 
-#ifndef _WIN32
-#define CALLBACK
-#endif
-
 #define H_SPUirqAddr     0x0da4
 #define H_SPUaddr        0x0da6
 #define H_SPUdata        0x0da8
@@ -41,4 +37,4 @@
 
 void CALLBACK SPUirq(void);
 
-#endif /* __SPU_H__ */
+#endif
diff --git a/libpcsxcore/system.h b/libpcsxcore/system.h
index 1a2142c1..9f7159e1 100644
--- a/libpcsxcore/system.h
+++ b/libpcsxcore/system.h
@@ -20,16 +20,16 @@
 #ifndef __SYSTEM_H__
 #define __SYSTEM_H__
 
-int  SysInit();							// Init mem and plugins
+int SysInit();							// Init mem and plugins
 void SysReset();						// Resets mem
-void SysPrintf(char *fmt, ...);			// Printf used by bios syscalls
-void SysMessage(char *fmt, ...);		// Message used to print msg to users
-void *SysLoadLibrary(char *lib);		// Loads Library
-void *SysLoadSym(void *lib, char *sym);	// Loads Symbol from Library
+void SysPrintf(const char *fmt, ...);	// Printf used by bios syscalls
+void SysMessage(const char *fmt, ...);	// Message used to print msg to users
+void *SysLoadLibrary(const char *lib);	// Loads Library
+void *SysLoadSym(void *lib, const char *sym);	// Loads Symbol from Library
 const char *SysLibError();				// Gets previous error loading sysbols
 void SysCloseLibrary(void *lib);		// Closes Library
 void SysUpdate();						// Called on VBlank (to update i.e. pads)
 void SysRunGui();						// Returns to the Gui
 void SysClose();						// Close mem and plugins
 
-#endif /* __SYSTEM_H__ */
+#endif