From: kub <derkub@gmail.com>
Date: Tue, 20 Feb 2024 21:04:13 +0000 (+0100)
Subject: ps2, minor fixes
X-Git-Tag: v2.00~118
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0abaf2adab530c58c4869a2219c8eaf5c0b270d;p=picodrive.git

ps2, minor fixes
---

diff --git a/platform/ps2/Makefile b/platform/ps2/Makefile
index 42ba39d6..a0e20095 100644
--- a/platform/ps2/Makefile
+++ b/platform/ps2/Makefile
@@ -6,22 +6,26 @@ $(error need VER)
 endif
 endif
 
+include ../../config.mak
+
 ../../tools/textfilter: ../../tools/textfilter.c
 	make -C ../../tools/ textfilter
 
 readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog
 	../../tools/textfilter ../base_readme.txt $@ PS2
 
-# ?
-rel: ../../PicoDrive readme.txt ../game_def.cfg
-	mkdir -p PicoDrive/skin/
-	cp $^ PicoDrive/
-	cp ../../skin/* PicoDrive/skin/
-	zip -9 -r ../../PicoDrive_ps2_$(VER).zip PicoDrive
-	rm -rf PicoDrive
-	mkdir bin_to_cso_mp3
-	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
-	zip -9 -r ../../PicoDrive_ps2_$(VER).zip bin_to_cso_mp3
-	rm -rf bin_to_cso_mp3
+PicoDrive: ../../PicoDrive
+	$(STRIP) $^ -o $@
+
+PicoDrive.elf: PicoDrive
+	ps2-packer $^ $@
 
+rel: PicoDrive.elf readme.txt ../game_def.cfg
+	mkdir -p out/PicoDrive/skin/ out/bin_to_cso_mp3
+	cp $^ out/PicoDrive/
+	cp ../../skin/* out/PicoDrive/skin/
+	#mkdir -p out/bin_to_cso_mp3
+	#cp ../../tools/bin_to_cso_mp3/* out/bin_to_cso_mp3/
+	cd out && zip -9 -r ../../../PicoDrive_ps2_$(VER).zip *
+	rm -rf out
 
diff --git a/platform/ps2/emu.c b/platform/ps2/emu.c
index d5385930..e738fba4 100644
--- a/platform/ps2/emu.c
+++ b/platform/ps2/emu.c
@@ -114,7 +114,7 @@ static void writeSound(int len)
 {
 	int ret, l;
 
-	if (samples_made - samples_done < samples_block * (SOUND_BLOCK_COUNT-3)) {
+	if (samples_made - samples_done <= samples_block * (SOUND_BLOCK_COUNT-3)) {
 		samples_made += len / 2;
 		PicoIn.sndOut += len / 2;
 	} else