Merge git://github.com/notaz/pcsx_rearmed

8 files changed, 12 insertions, 8 deletions

diff --git a/plugins/dfinput/main.h b/plugins/dfinput/main.h
index 15d05e7..e83306a 100644
--- a/plugins/dfinput/main.h
+++ b/plugins/dfinput/main.h
@@ -1,4 +1,4 @@
-#include "../../libpcsxcore/psemu_plugin_defs.h"
+#include "psemu_plugin_defs.h"
 #include "externals.h"
 
 extern unsigned char CurPad, CurByte, CurCmd, CmdLen;
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index a8019b9..53a254a 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include "../../libpcsxcore/psemu_plugin_defs.h"
+#include "psemu_plugin_defs.h"
 #include "main.h"
 
 enum {
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index 22e5844..f4ef243 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "arm_features.h"
 
 .text
 .align 2
@@ -100,7 +101,7 @@ mcr_finish:
     vstmiage    r3!, {d8}
     bx          lr
 
-#else
+#elif defined(HAVE_ARMV5)
 
 .global mix_chan @ (int start, int count, int lv, int rv)
 mix_chan:
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 45a7886..2466569 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -25,6 +25,7 @@
 #include "externals.h"
 #include "registers.h"
 #include "out.h"
+#include "arm_features.h"
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -615,7 +616,7 @@ static int do_samples_noise(int ch, int ns, int ns_to)
  return ret;
 }
 
-#ifdef __arm__
+#ifdef HAVE_ARMV5
 // asm code; lv and rv must be 0-3fff
 extern void mix_chan(int start, int count, int lv, int rv);
 extern void mix_chan_rvb(int start, int count, int lv, int rv);
diff --git a/plugins/dfxvideo/Makefile b/plugins/dfxvideo/Makefile
index 250cc49..580e735 100644
--- a/plugins/dfxvideo/Makefile
+++ b/plugins/dfxvideo/Makefile
@@ -1,7 +1,6 @@
 CFLAGS += -Wall -ggdb -O2
 CFLAGS += -fno-strict-aliasing -ffast-math
-# ugh
-CFLAGS += -I../../libpcsxcore
+CFLAGS += -I../../include
 
 include ../../config.mak
 
diff --git a/plugins/dfxvideo/draw_pl.c b/plugins/dfxvideo/draw_pl.c
index ed07e75..61fb94c 100644
--- a/plugins/dfxvideo/draw_pl.c
+++ b/plugins/dfxvideo/draw_pl.c
@@ -11,7 +11,7 @@
 
 #include "../gpulib/cspace.h"
 #include "../../frontend/plugin_lib.h"
-#include "../../frontend/pcnt.h"
+#include "pcnt.h"
 
 // misc globals
 long           lLowerpart;
diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai/Makefile
index cf2e5d2..994997f 100644
--- a/plugins/gpu_unai/Makefile
+++ b/plugins/gpu_unai/Makefile
@@ -1,5 +1,6 @@
 CFLAGS += -ggdb -Wall -O3 -ffast-math
 CFLAGS += -DREARMED
+CFLAGS += -I../../include
 
 include ../../config.mak
 
diff --git a/plugins/gpu_unai/gpu_fixedpoint.h b/plugins/gpu_unai/gpu_fixedpoint.h
index 03f07d2..e72fda1 100644
--- a/plugins/gpu_unai/gpu_fixedpoint.h
+++ b/plugins/gpu_unai/gpu_fixedpoint.h
@@ -21,6 +21,8 @@
 #ifndef FIXED_H
 #define FIXED_H
 
+#include "arm_features.h"
+
 typedef s32 fixed;
 
 #ifdef GPU_TABLE_10_BITS
@@ -55,7 +57,7 @@ INLINE u32 Log2(u32 _a)
 }
 */
 
-#ifdef __arm__
+#ifdef HAVE_ARMV5
 INLINE u32 Log2(u32 x) { u32 res; asm("clz %0,%1" : "=r" (res) : "r" (x)); return 32-res; }
 #else
 INLINE u32 Log2(u32 x) { u32 i = 0; for ( ; x > 0; ++i, x >>= 1); return i - 1; }