fix GP2X build

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@809 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/cpu/sh2mame/sh2.h b/cpu/sh2mame/sh2.h
index e5616ae..ef2b06e 100644 (file)
--- a/cpu/sh2mame/sh2.h
+++ b/cpu/sh2mame/sh2.h
@@ -32,17 +32,17 @@
 \r
 typedef struct\r
 {\r
-       UINT32  r[16];\r
-       UINT32  ppc;\r
-       UINT32  pc;\r
-       UINT32  pr;\r
-       UINT32  sr;\r
-       UINT32  gbr, vbr;\r
-       UINT32  mach, macl;\r
+       unsigned int    r[16];\r
+       unsigned int    ppc;\r
+       unsigned int    pc;\r
+       unsigned int    pr;\r
+       unsigned int    sr;\r
+       unsigned int    gbr, vbr;\r
+       unsigned int    mach, macl;\r
 \r
-       UINT32  ea;\r
-       UINT32  delay;\r
-       UINT32  test_irq;\r
+       unsigned int    ea;\r
+       unsigned int    delay;\r
+       unsigned int    test_irq;\r
 \r
        int     pending_irl;\r
        int     pending_int_irq;        // internal irq\r
@@ -50,7 +50,7 @@ typedef struct
        void    (*irq_callback)(int id, int level);\r
        int     is_slave;\r
 \r
-       UINT32  cycles_aim;     // subtract sh2_icount to get global counter\r
+       unsigned int    cycles_aim;     // subtract sh2_icount to get global counter\r
 } SH2;\r
 \r
 SH2 *sh2; // active sh2\r

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index fedadf3..42f6fcb 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -12,6 +12,7 @@ asm_cdmemory = 1
 amalgamate = 0\r
 #profile = 1\r
 #use_musashi = 1\r
+use_sh2mame = 1\r
 #up = 1\r
 \r
 \r
@@ -111,6 +112,10 @@ else
 DEFINC += -D_USE_DRZ80\r
 OBJS += cpu/DrZ80/drz80.o\r
 endif\r
+ifeq "$(use_sh2mame)" "1"\r
+OBJS += cpu/sh2mame/sh2pico.o\r
+else\r
+endif\r
 \r
 vpath %.c = ../..\r
 vpath %.s = ../..\r
@@ -118,7 +123,7 @@ vpath %.S = ../..
 \r
 DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \\r
        pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \\r
-       cpu/mz80 cpu/DrZ80\r
+       cpu/mz80 cpu/DrZ80 cpu/sh2mame\r
 \r
 \r
 all: mkdirs PicoDrive\r

diff --git a/platform/gp2x/version.h b/platform/gp2x/version.h
index 6f00487..69cf800 100644 (file)
--- a/platform/gp2x/version.h
+++ b/platform/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.56"\r
+#define VERSION "1.70"\r
 \r