1.56 release

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

diff --git a/base_readme.txt b/base_readme.txt
index c6757ea..425c030 100644 (file)
--- a/base_readme.txt
+++ b/base_readme.txt
@@ -644,6 +644,15 @@ Additional thanks
 \r
 Changelog\r
 ---------\r
+1.56\r
+  * Changed sync in Sega CD emulation again. Should fix games that\r
+    broke after changes in 1.51a.\r
+  * Fixed default keys rebinding when they shouldn't.\r
+  * Fixed sram being loaded from wrong game.\r
+  * Emu should no longer hang shortly after using fast-forward.\r
+  * Fixed save states sometimes no longer showing up in save state menu.\r
+  * ARM: some asm code refactoring for slight speed improvement.\r
+\r
 1.55\r
   + Added Wiz support. Now the same GP2X binary supports F100/F200 and Wiz.\r
   * Changed shadow/hilight handling a bit, fixes some effects in Pirates! Gold.\r

diff --git a/common/menu.c b/common/menu.c
index 774f05c..bd4eb70 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -17,6 +17,7 @@
 #include "plat.h"\r
 #include "posix.h"\r
 #include <version.h>\r
+#include <revision.h>\r
 \r
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
@@ -1036,6 +1037,9 @@ static int menu_loop_savestate(int is_loading)
 \r
        state_check_slots();\r
 \r
+       if (!(state_slot_flags & (1 << menu_sel)) && is_loading)\r
+               menu_sel = menu_sel_max;\r
+\r
        for (;;)\r
        {\r
                draw_savestate_menu(menu_sel, is_loading);\r
@@ -1736,6 +1740,12 @@ static void draw_text_debug(const char *str, int skip, int from)
        }\r
 }\r
 \r
+#ifdef __GNUC__\r
+#define COMPILER "gcc " __VERSION__\r
+#else\r
+#define COMPILER\r
+#endif\r
+\r
 static void draw_frame_debug(void)\r
 {\r
        char layer_str[48] = "layers:             ";\r
@@ -1746,7 +1756,7 @@ static void draw_frame_debug(void)
 \r
        memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
        pemu_forced_frame(0);\r
-       smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);\r
+       smalltext_out16(4, 1, "build: r" REVISION "  "__DATE__ " " __TIME__ " " COMPILER, 0xffff);\r
        smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
 }\r
 \r

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 6e899f2..f2000ad 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -121,6 +121,12 @@ all: mkdirs PicoDrive
 \r
 include ../common/common_arm.mak\r
 \r
+platform/common/menu.o : revision.h\r
+\r
+revision.h:\r
+       @echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp\r
+       @diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@\r
+\r
 # partial linking helps profiled builds due to section merging\r
 PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        $(LD) -r -o $@ $^\r

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

diff --git a/linux/Makefile b/linux/Makefile
index 747cc83..9a6d8f5 100644 (file)
--- a/linux/Makefile
+++ b/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