From b3158e9837629be3d36176728848f10fba341fc9 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Thu, 13 Aug 2009 21:34:25 +0000
Subject: [PATCH] 1.56 release

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@750 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 platform/base_readme.txt |  9 +++++++++
 platform/common/menu.c   | 12 +++++++++++-
 platform/gp2x/Makefile   |  6 ++++++
 platform/gp2x/version.h  |  2 +-
 platform/linux/Makefile  |  5 +++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/platform/base_readme.txt b/platform/base_readme.txt
index c6757eae..425c0306 100644
--- a/platform/base_readme.txt
+++ b/platform/base_readme.txt
@@ -644,6 +644,15 @@ Additional thanks
 
 Changelog
 ---------
+1.56
+  * Changed sync in Sega CD emulation again. Should fix games that
+    broke after changes in 1.51a.
+  * Fixed default keys rebinding when they shouldn't.
+  * Fixed sram being loaded from wrong game.
+  * Emu should no longer hang shortly after using fast-forward.
+  * Fixed save states sometimes no longer showing up in save state menu.
+  * ARM: some asm code refactoring for slight speed improvement.
+
 1.55
   + Added Wiz support. Now the same GP2X binary supports F100/F200 and Wiz.
   * Changed shadow/hilight handling a bit, fixes some effects in Pirates! Gold.
diff --git a/platform/common/menu.c b/platform/common/menu.c
index 774f05c5..bd4eb70a 100644
--- a/platform/common/menu.c
+++ b/platform/common/menu.c
@@ -17,6 +17,7 @@
 #include "plat.h"
 #include "posix.h"
 #include <version.h>
+#include <revision.h>
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
@@ -1036,6 +1037,9 @@ static int menu_loop_savestate(int is_loading)
 
 	state_check_slots();
 
+	if (!(state_slot_flags & (1 << menu_sel)) && is_loading)
+		menu_sel = menu_sel_max;
+
 	for (;;)
 	{
 		draw_savestate_menu(menu_sel, is_loading);
@@ -1736,6 +1740,12 @@ static void draw_text_debug(const char *str, int skip, int from)
 	}
 }
 
+#ifdef __GNUC__
+#define COMPILER "gcc " __VERSION__
+#else
+#define COMPILER
+#endif
+
 static void draw_frame_debug(void)
 {
 	char layer_str[48] = "layers:             ";
@@ -1746,7 +1756,7 @@ static void draw_frame_debug(void)
 
 	memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
 	pemu_forced_frame(0);
-	smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);
+	smalltext_out16(4, 1, "build: r" REVISION "  "__DATE__ " " __TIME__ " " COMPILER, 0xffff);
 	smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);
 }
 
diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 6e899f24..f2000ad6 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -121,6 +121,12 @@ all: mkdirs PicoDrive
 
 include ../common/common_arm.mak
 
+platform/common/menu.o : revision.h
+
+revision.h:
+	@echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp
+	@diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@
+
 # partial linking helps profiled builds due to section merging
 PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 	$(LD) -r -o $@ $^
diff --git a/platform/gp2x/version.h b/platform/gp2x/version.h
index c3189c59..6f004873 100644
--- a/platform/gp2x/version.h
+++ b/platform/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.55"
+#define VERSION "1.56"
 
diff --git a/platform/linux/Makefile b/platform/linux/Makefile
index 747cc835..9a6d8f50 100644
--- a/platform/linux/Makefile
+++ b/platform/linux/Makefile
@@ -106,6 +106,11 @@ mkdirs:
 pico/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
 pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
 pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
+platform/common/menu.o : revision.h
+
+revision.h:
+	@echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp
+	@diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@
 
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
-- 
2.39.5