Merge r7965 from Trunk into branches/release.

This fixes Sega CD Scanning (fast forward and rewind).
TASEmulators · Oct 10, 2014 · fc4526d · fc4526d
1 parent 804af1c
commit fc4526d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/Dist/MakeRelease.bat b/Dist/MakeRelease.bat
@@ -14,13 +14,15 @@ copy *.dll dll
 zip -X -r ..\Dist\BizHawk.zip EmuHawk.exe DiscoHawk.exe defctrl.json dll shaders gamedb NES\Palettes Lua Gameboy\Palettes -x *.pdb -x *.lib -x *.pgd -x *.exp -x dll\libsneshawk-64*.exe
 
 cd ..\Dist
+
 unzip BizHawk.zip -d temp
 del BizHawk.zip
 
 rmdir /s /q temp\lua
 svn export ..\output\lua temp\Lua
 
 cd temp
+md firmware
 upx -d dll\*.dll
 upx -d dll\*.exe
 upx -d *.exe

diff --git a/genplus-gx/core/cd_hw/cdd.c b/genplus-gx/core/cd_hw/cdd.c
@@ -472,6 +472,7 @@ void cdd_update(void)
   {
     /* fast-forward or fast-rewind */
     cdd.lba += cdd.scanOffset;
+	cdd.sampleLba += cdd.scanOffset;
 
     /* check current track limits */
     if (cdd.lba >= cdd.toc.tracks[cdd.index].end)

diff --git a/output/dll/libgenplusgx.dll b/output/dll/libgenplusgx.dll