move platform-independent stuff out of /gp2x.

8 files changed, 5 insertions, 9 deletions

diff --git a/gp2x/arm_codegen.h b/arm/arm_codegen.h
index 42b8795..42b8795 100644
--- a/gp2x/arm_codegen.h
+++ b/arm/arm_codegen.h
diff --git a/gp2x/arm_dpimacros.h b/arm/arm_dpimacros.h
index 743d5a5..743d5a5 100644
--- a/gp2x/arm_dpimacros.h
+++ b/arm/arm_dpimacros.h
diff --git a/gp2x/arm_emit.h b/arm/arm_emit.h
index 5d2eee0..5d2eee0 100644
--- a/gp2x/arm_emit.h
+++ b/arm/arm_emit.h
diff --git a/gp2x/arm_stub.S b/arm/arm_stub.S
index a7271fd..a7271fd 100644
--- a/gp2x/arm_stub.S
+++ b/arm/arm_stub.S
diff --git a/gp2x/video_blend.S b/arm/video_blend.S
index 63a5480..63a5480 100644
--- a/gp2x/video_blend.S
+++ b/arm/video_blend.S
diff --git a/cpu_threaded.c b/cpu_threaded.c
index 4ff1548..377fb9d 100644
--- a/cpu_threaded.c
+++ b/cpu_threaded.c
@@ -190,13 +190,9 @@ extern u8 bit_count[256];
 
 #include "psp/mips_emit.h"
 
-#elif defined(GP2X_BUILD)
+#elif defined(ARM_ARCH)
 
-#include "gp2x/arm_emit.h"
-
-#elif defined(GIZ_BUILD)
-
-#include "giz/arm_emit.h"
+#include "arm/arm_emit.h"
 
 #else
 
diff --git a/gp2x/Makefile b/gp2x/Makefile
index ed01178..2096419 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -20,7 +20,7 @@ endif
 
 # Platform specific definitions 
 
-VPATH      += ..
+VPATH      += .. ../arm
 CFLAGS     += -DARM_ARCH -DGP2X_BUILD
 ifeq ($(WIZ),1)
 CFLAGS     += -DWIZ_BUILD
diff --git a/video.c b/video.c
index 8730650..ffc6c7c 100644
--- a/video.c
+++ b/video.c
@@ -2403,7 +2403,7 @@ fill_line_builder(color32);
 
 #ifdef RENDER_COLOR16_NORMAL
 
-#ifndef GP2X_BUILD
+#ifndef ARM_ARCH
 
 void expand_normal(u16 *screen_ptr, u32 start, u32 end)
 {
@@ -2432,7 +2432,7 @@ void expand_normal(u16 *screen_ptr, u32 start, u32 end)
 #endif
 
 
-#ifndef GP2X_BUILD
+#ifndef ARM_ARCH
 
 void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr,
  u32 start, u32 end)