From: notaz <notasas@gmail.com>
Date: Tue, 6 Oct 2009 21:59:24 +0000 (+0000)
Subject: fix GP2X build
X-Git-Tag: v1.85~241
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d29444dfc5c59987ea7bab80b8c9f03e5f2d571;p=picodrive.git

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 e5616aef..ef2b06e6 100644
--- a/cpu/sh2mame/sh2.h
+++ b/cpu/sh2mame/sh2.h
@@ -32,17 +32,17 @@
 
 typedef struct
 {
-	UINT32	r[16];
-	UINT32	ppc;
-	UINT32	pc;
-	UINT32	pr;
-	UINT32	sr;
-	UINT32	gbr, vbr;
-	UINT32	mach, macl;
+	unsigned int	r[16];
+	unsigned int	ppc;
+	unsigned int	pc;
+	unsigned int	pr;
+	unsigned int	sr;
+	unsigned int	gbr, vbr;
+	unsigned int	mach, macl;
 
-	UINT32	ea;
-	UINT32	delay;
-	UINT32	test_irq;
+	unsigned int	ea;
+	unsigned int	delay;
+	unsigned int	test_irq;
 
 	int	pending_irl;
 	int	pending_int_irq;	// internal irq
@@ -50,7 +50,7 @@ typedef struct
 	void	(*irq_callback)(int id, int level);
 	int	is_slave;
 
-	UINT32	cycles_aim;	// subtract sh2_icount to get global counter
+	unsigned int	cycles_aim;	// subtract sh2_icount to get global counter
 } SH2;
 
 SH2 *sh2; // active sh2
diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index fedadf35..42f6fcbe 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -12,6 +12,7 @@ asm_cdmemory = 1
 amalgamate = 0
 #profile = 1
 #use_musashi = 1
+use_sh2mame = 1
 #up = 1
 
 
@@ -111,6 +112,10 @@ else
 DEFINC += -D_USE_DRZ80
 OBJS += cpu/DrZ80/drz80.o
 endif
+ifeq "$(use_sh2mame)" "1"
+OBJS += cpu/sh2mame/sh2pico.o
+else
+endif
 
 vpath %.c = ../..
 vpath %.s = ../..
@@ -118,7 +123,7 @@ vpath %.S = ../..
 
 DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \
 	pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \
-	cpu/mz80 cpu/DrZ80
+	cpu/mz80 cpu/DrZ80 cpu/sh2mame
 
 
 all: mkdirs PicoDrive
diff --git a/platform/gp2x/version.h b/platform/gp2x/version.h
index 6f004873..69cf8006 100644
--- a/platform/gp2x/version.h
+++ b/platform/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.56"
+#define VERSION "1.70"