release 1.80beta2

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

diff --git a/platform/base_readme.txt b/platform/base_readme.txt
index d9dec5d..e4361c4 100644 (file)
--- a/platform/base_readme.txt
+++ b/platform/base_readme.txt
@@ -93,8 +93,14 @@ The game must be dumped to ISO/CSO+MP3/WAV or CUE+BIN format. When using
 CUE/BIN, you must load .cue file from the menu, or else the emu will not find\r
 audio tracks.\r
 CUE/BIN usually takes a lot of space, so it can be converted to cue/cso/mp3 by\r
+#ifdef PANDORA\r
+using bin_to_cso_mp3 tool, which can be downloaded from:\r
+http://notaz.gp2x.de/releases/misc/bin_to_cso_mp3.zip\r
+See readme in the bin_to_cso_mp3/ directory for details.\r
+#else\r
 using bin_to_cso_mp3 tool, which is included with the emulator. See readme in\r
 the bin_to_cso_mp3/ directory for details.\r
+#endif\r
 \r
 ISO+mp3 files can be named similarly as for other emus.\r
 Here are some examples:\r
@@ -242,6 +248,7 @@ Restores all options (except controls) to defaults.
 Display options\r
 ---------------\r
 \r
+#ifndef PANDORA\r
 @@1. "Renderer"\r
 #ifdef GP2X\r
 8bit fast:\r
@@ -266,6 +273,7 @@ line by line, like the accurate one does. But because of the way it works it
 can't render any mid-frame image changes (raster effects), so it is useful only\r
 for some games.\r
 #endif\r
+#endif\r
 \r
 #ifdef GP2X\r
 @@1. "Scaling"\r
@@ -340,7 +348,7 @@ Color gamma can be adjusted with this.
 This can be used to reduce unwanted "ghosting" effect for dark games, by making\r
 black pixels brighter. Use in conjunction with "gamma adjustment" for more effect.\r
 \r
-@@1. "Wait for vsync"\r
+@@1. "Wait for v-sync"\r
 Wait for the screen to finish updating before switching to next frame, to avoid tearing.\r
 There are 3 options:\r
 * never: don't wait for vsync.\r
@@ -356,6 +364,9 @@ Scale the image up, but keep 4:3 aspect, by adding black borders.
 @@1. "Set to fullscreen"\r
 Adjust the resizing options to make the game image fullscreen.\r
 #endif\r
+#ifdef PANDORA\r
+To be updated..\r
+#endif\r
 \r
 \r
 Sega/Mega CD options \r
@@ -464,21 +475,14 @@ Key configuration
 \r
 Select "Configure controls" from the main menu. Then select "Player 1" and you will\r
 see two columns. The left column lists names of Genesis/MD controller buttons, and\r
-#ifdef GP2X\r
-the right GP2X ones, which are assigned to them. If you bind 2 different GP2X buttons\r
+the right column your handheld ones, which are assigned.\r
+#ifndef PANDORA\r
+If you bind 2 different buttons to the same action, you will get a combo\r
+(which means that you will have to press both buttons for that action to happen).\r
 #endif\r
-#ifdef GIZ\r
-the right Giz ones, which are assigned to them. If you bind 2 different Giz buttons\r
-#endif\r
-#ifdef PSP\r
-the right PSP ones, which are assigned to them. If you bind 2 different PSP buttons\r
-#endif\r
-to the same action, you will get a combo (which means that you will have to press\r
-both buttons for that action to happen).\r
 \r
 There is also option to enable 6 button pad (will allow you to configure XYZ\r
 buttons), and an option to set turbo rate (in Hz) for turbo buttons.\r
-#endif\r
 #ifndef UIQ\r
 \r
 \r
@@ -623,6 +627,7 @@ Additional thanks
 * Haze for his research (http://haze.mameworld.info).\r
 * Lordus, Exophase and Rokas for various ideas.\r
 * Nemesis for his YM2612 research.\r
+* Many posters at spritesmind.net forums valuable information.\r
 * Mark and Jean-loup for zlib library.\r
 * ketchupgun for the skin.\r
 #ifdef GP2X\r
@@ -652,10 +657,17 @@ Additional thanks
 \r
 Changelog\r
 ---------\r
+1.80beta2\r
+  * Pandora: updated documentation.\r
+\r
 1.80beta1\r
-  * Added pandora port.\r
-  * Lots of other stuff I don't have time to write here\r
-    (to be added here soon).\r
+  + Added pandora port.\r
+  * Internal refactoring for 32x/SMS support.\r
+  * Move mapper database to external file.\r
+  + Added preliminary SMS emulation.\r
+  + Added emulation of 32x peripherals including VDP. More work is needed here.\r
+  + ARM: Added new SH2 recompiler for 32x. Some unification with SVP one.\r
+  - Disabled most of the above bacause I'm not yet happy with the results.\r
 \r
 1.56\r
   * Changed sync in Sega CD emulation again. Should fix games that\r

diff --git a/platform/pandora/Makefile b/platform/pandora/Makefile
index 0f73777..4827a54 100644 (file)
--- a/platform/pandora/Makefile
+++ b/platform/pandora/Makefile
@@ -93,12 +93,12 @@ tidy:
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ PANDORA\r
 \r
+PicoDrive.pxml: PicoDrive.pxml.template\r
+       ./make_pxml.sh PicoDrive.pxml.template PicoDrive.pxml\r
+\r
 # ----------- release -----------\r
-ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
-ifeq ($(VER),)\r
-$(error need VER)\r
-endif\r
-endif\r
+\r
+VER = $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')\r
 \r
 rel: PicoDrive PicoDrive.run picorestore ../../pico/carthw.cfg readme.txt \\r
        skin PicoDrive.png PicoDrive_p.png PicoDrive.pxml\r

diff --git a/platform/pandora/PicoDrive.pxml b/platform/pandora/PicoDrive.pxml.template
similarity index 68%
rename from platform/pandora/PicoDrive.pxml
rename to platform/pandora/PicoDrive.pxml.template
index ce03397..4164db3 100644 (file)
--- a/platform/pandora/PicoDrive.pxml
+++ b/platform/pandora/PicoDrive.pxml.template
@@ -17,12 +17,12 @@
  
   <author name="notaz" website="http://notaz.gp2x.de/"/>
  
-  <version major="1" minor="80" release="0" build="0"/><!--This programs version-->
-  <info name="readme" type="text/plain" src="readme.txt"/>
+  <version major="@major@" minor="@minor@" release="0" build="@revision@"/>
+  <info name="PicoDrive readme" type="text/plain" src="readme.txt"/>
  
   <categories>
-    <category name="Game"><!--category like "Games", "Graphics", "Internet" etc-->
-    <subcategory name="Emulator"/><!--subcategory, like "Board Games", "Strategy", "First Person Shooters"-->
+    <category name="Game">
+    <subcategory name="Emulator"/>
     </category>
   </categories>
 </application>

diff --git a/platform/pandora/PicoDrive.run b/platform/pandora/PicoDrive.run
index 2444ef5..dc7c04d 100755 (executable)
--- a/platform/pandora/PicoDrive.run
+++ b/platform/pandora/PicoDrive.run
@@ -2,5 +2,5 @@
 
 ./PicoDrive "$@"
 
-# restore stuff ip pico crashes
+# restore stuff if pico crashes
 ./picorestore

diff --git a/platform/pandora/make_pxml.sh b/platform/pandora/make_pxml.sh
new file mode 100755 (executable)
index 0000000..875c791
--- /dev/null
+++ b/platform/pandora/make_pxml.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+sed -i
+
+major=`head -n 1 version.h | sed 's/.*"\([0-9]*\)\.\([0-9]*\).*/\1/g'`
+minor=`head -n 1 version.h | sed 's/.*"\([0-9]*\)\.\([0-9]*\).*/\2/g'`
+revision=`head -n 1 revision.h | sed 's/.*"\([0-9]*\)".*/\1/g'`
+
+sed 's/@major@/'$major'/' "$1" > "$2"
+sed -i 's/@minor@/'$minor'/' "$2"
+sed -i 's/@revision@/'$revision'/' "$2"

diff --git a/platform/pandora/version.h b/platform/pandora/version.h
index 8788af4..57325c5 100644 (file)
--- a/platform/pandora/version.h
+++ b/platform/pandora/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.80beta1"\r
+#define VERSION "1.80beta2"\r
 \r