X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2FMakefile;h=4827a54e0c3fdd231f3ebd7e7406b55c94a40036;hb=ff89a9c68bb44bd03b420f3ba26096756fba0fed;hp=4f132dfbd61edf4c90222fd57223ba6118b8eb74;hpb=d2f29611d1379a249c8f3f955ed16a336f9290cd;p=libpicofe.git

diff --git a/pandora/Makefile b/pandora/Makefile
index 4f132df..4827a54 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
@@ -18,6 +19,9 @@ asm_cdmemory = 1
 #profile = 1
 #drc_debug = 3
 
+no_32x = 1
+no_sms = 1
+
 -include Makefile.local
 
 ifeq "$(use_musashi)" "1"
@@ -33,7 +37,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
@@ -48,7 +52,8 @@ OBJS += pandora.o emu.o asm_utils.o
 OBJS += platform/common/emu.o platform/common/menu.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/linux/in_evdev.o platform/linux/sndout_oss.o platform/linux/plat.o
+	platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \
+	platform/linux/plat.o platform/linux/oshide.o
 
 # ARM stuff
 OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
@@ -65,7 +70,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
@@ -86,13 +91,18 @@ 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
 
 # ----------- 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