X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;fp=gp2x%2FMakefile;h=62bbc9bfa8ae8d809c1f98891e2fd0201b1b7076;hb=38163dd7df6fc61794d7bb420737a68455c4637c;hp=2e5a10441de51544bb5d56d18be0db5fb0771059;hpb=ed8e30f8c2c6352fe90671059d35085121815850;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 2e5a104..62bbc9b 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -106,21 +106,22 @@ readme.txt: ../../tools/textfilter ../base_readme.txt
 	../../tools/textfilter ../base_readme.txt $@ GP2X
 
 # ----------- release -----------
-ifneq ($(findstring rel,$(MAKECMDGOALS)),)
-ifeq ($(VER),)
-$(error need VER)
-endif
-endif
+VER ?= $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
 CODE940 = code940/pico940_v3.bin
 
-rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt PicoDrive.png ../game_def.cfg \
-		warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko
-	zip -9 -j ../../PicoDrive_$(VER).zip $^
-	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
-	mkdir bin_to_cso_mp3
-	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
-	zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3
-	rm -rf bin_to_cso_mp3
+rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \
+		PicoDrive.png PicoDrive_s.png PicoDrive_t.png \
+		warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko \
+		../../pico/carthw.cfg
+	mkdir -p out/PicoDrive/skin/
+	cp $^ out/PicoDrive/
+	cp PicoDrive.ini out/
+	cp skin/*.png out/PicoDrive/skin/
+	cp skin/*.txt out/PicoDrive/skin/
+	mkdir out/bin_to_cso_mp3
+	cp ../../tools/bin_to_cso_mp3/* out/bin_to_cso_mp3/
+	cd out && zip -9 -r ../../../PicoDrive_$(VER).zip *
+	rm -rf out
 
 $(CODE940):
 	make -C code940/