X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=030bab67d5b0cc325dae3dc08c08d5cea6dc58a8;hb=e99d80480196f551f7e6c06deae3750de19b4c0e;hp=431a357125bc7f9d41a9871473fff5d4fc422df4;hpb=662e622b59369f975691a70756f80188d8d27ea0;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 431a357..030bab6 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -55,9 +55,9 @@ OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
 OBJS += pico/sound/mix_arm.o
 
 # common
-OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
+OBJS += platform/common/emu.o platform/common/menu_pico.o platform/common/fonts.o platform/common/config.o \
 	platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \
-	platform/common/mp3_helix.o platform/common/input.o platform/common/main.o \
+	platform/common/mp3_helix.o platform/common/input.o platform/common/main.o platform/common/mp3.o \
 	platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o
 
 # unzip
@@ -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/