move platform-independent stuff out of /gp2x.

2011-09-02 17:44:41 +03:00 · 2011-09-02 17:44:41 +03:00 · d5e0983c10
commit d5e0983c10
parent c3c98c2f7c
8 changed files with 5 additions and 9 deletions
--- a/gp2x/arm_codegen.h
+++ b/gp2x/arm_codegen.h
--- a/gp2x/arm_dpimacros.h
+++ b/gp2x/arm_dpimacros.h
--- a/gp2x/arm_emit.h
+++ b/gp2x/arm_emit.h
--- a/gp2x/arm_stub.S
+++ b/gp2x/arm_stub.S
--- a/gp2x/video_blend.S
+++ b/gp2x/video_blend.S
--- 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

--- 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
--- 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)