X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2FMakefile;h=2cae5d49446ee877551ef132e43d67e5a52c76f3;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=c70c8353243b2c45b51a1d51576f78f2b8df8231;hpb=b188c2b6d0448a9c328a9dcae5ba5c8c8b5273f3;p=libpicofe.git

diff --git a/pandora/Makefile b/pandora/Makefile
index c70c835..2cae5d4 100644
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -1,6 +1,7 @@
 #export CROSS = arm-none-linux-gnueabi-
 CROSS ?= $(CROSS_COMPILE)
 LIBROOT = /home/notaz/dev/pnd/libroot
+PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
 # settings
 use_cyclone = 1
@@ -33,7 +34,7 @@ CFLAGS += -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a
 ifeq ($(DEBUG),)
 CFLAGS += -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math
 endif
-LDFLAGS += -lm -lpng -L$(LIBROOT)/lib -static
+LDFLAGS += -L$(LIBROOT)/lib -Wl,-Bstatic -lpng -Wl,-Bdynamic -lm -lpthread -ldl
 ASFLAGS = -mcpu=cortex-a8
 CC = $(CROSS)gcc
 STRIP = $(CROSS)strip
@@ -42,14 +43,14 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += pandora.o emu.o asm_utils.o
+OBJS += plat.o asm_utils.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/mp3_helix.o platform/common/arm_linux.o \
-	platform/common/readpng.o platform/common/input.o platform/common/main.o \
+	platform/common/readpng.o platform/common/input.o platform/common/main.o platform/common/mp3.o \
 	platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \
-	platform/linux/plat.o
+	platform/linux/plat.o platform/linux/xenv.o
 
 # ARM stuff
 OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
@@ -66,7 +67,7 @@ vpath %.s = ../..
 vpath %.S = ../..
 DIRS += platform/linux zlib unzip
 
-all: mkdirs PicoDrive
+all: mkdirs PicoDrive picorestore
 
 include ../common/common.mak
 include ../common/common_arm.mak
@@ -87,13 +88,20 @@ tidy:
 	$(RM) $(OBJS)
 
 readme.txt: ../../tools/textfilter ../base_readme.txt
-	../../tools/textfilter ../base_readme.txt $@ GP2X
+	../../tools/textfilter ../base_readme.txt $@ PANDORA
+
+PicoDrive.pxml: PicoDrive.pxml.template
+	./make_pxml.sh PicoDrive.pxml.template PicoDrive.pxml
+
+platform/common/menu_pico.o: platform/common/menu.c menu.c
 
 # ----------- release -----------
-ifneq ($(findstring rel,$(MAKECMDGOALS)),)
-$(error TODO)
-ifeq ($(VER),)
-$(error need VER)
-endif
-endif
 
+VER ?= $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
+
+rel: PicoDrive PicoDrive.run picorestore ../../pico/carthw.cfg readme.txt \
+	skin PicoDrive.png PicoDrive_p.png PicoDrive.pxml
+	rm -rf out
+	mkdir out
+	cp -r $^ out/
+	$(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x PicoDrive.pxml -i PicoDrive.png -c