skip junk in mp3_helix, refactor find_sync_word

[libpicofe.git] / pandora / Makefile

diff --git a/pandora/Makefile b/pandora/Makefile
index 875c253..db3413b 100644 (file)
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -1,6 +1,7 @@
 #export CROSS = arm-none-linux-gnueabi-\r
 CROSS ?= $(CROSS_COMPILE)\r
 LIBROOT = /home/notaz/dev/pnd/libroot\r
+PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh\r
 \r
 # settings\r
 use_cyclone = 1\r
@@ -42,14 +43,14 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += pandora.o emu.o asm_utils.o\r
+OBJS += plat.o asm_utils.o\r
 \r
 # common\r
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
        platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o \\r
-       platform/common/readpng.o platform/common/input.o platform/common/main.o \\r
+       platform/common/readpng.o platform/common/input.o platform/common/main.o platform/common/mp3.o \\r
        platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \\r
-       platform/linux/plat.o platform/linux/x11h.o\r
+       platform/linux/plat.o platform/linux/oshide.o\r
 \r
 # ARM stuff\r
 OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
@@ -66,7 +67,7 @@ vpath %.s = ../..
 vpath %.S = ../..\r
 DIRS += platform/linux zlib unzip\r
 \r
-all: mkdirs PicoDrive\r
+all: mkdirs PicoDrive picorestore\r
 \r
 include ../common/common.mak\r
 include ../common/common_arm.mak\r
@@ -87,13 +88,20 @@ tidy:
        $(RM) $(OBJS)\r
 \r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
-       ../../tools/textfilter ../base_readme.txt $@ GP2X\r
+       ../../tools/textfilter ../base_readme.txt $@ PANDORA\r
+\r
+PicoDrive.pxml: PicoDrive.pxml.template\r
+       ./make_pxml.sh PicoDrive.pxml.template PicoDrive.pxml\r
+\r
+platform/common/menu.o: menu.c\r
 \r
 # ----------- release -----------\r
-ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
-$(error TODO)\r
-ifeq ($(VER),)\r
-$(error need VER)\r
-endif\r
-endif\r
 \r
+VER = $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')\r
+\r
+rel: PicoDrive PicoDrive.run picorestore ../../pico/carthw.cfg readme.txt \\r
+       skin PicoDrive.png PicoDrive_p.png PicoDrive.pxml\r
+       rm -rf out\r
+       mkdir out\r
+       cp -r $^ out/\r
+       $(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x PicoDrive.pxml -i PicoDrive.png -c\r