minor adjustmens

[libpicofe.git] / gp2x / Makefile

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