release 1.80beta1 for pandora

[libpicofe.git] / pandora / Makefile

diff --git a/pandora/Makefile b/pandora/Makefile
index 4f132df..0f73777 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
@@ -18,6 +19,9 @@ asm_cdmemory = 1
 #profile = 1\r
 #drc_debug = 3\r
 \r
+no_32x = 1\r
+no_sms = 1\r
+\r
 -include Makefile.local\r
 \r
 ifeq "$(use_musashi)" "1"\r
@@ -33,7 +37,7 @@ CFLAGS += -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a
 ifeq ($(DEBUG),)\r
 CFLAGS += -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 endif\r
-LDFLAGS += -lm -lpng -L$(LIBROOT)/lib -static\r
+LDFLAGS += -L$(LIBROOT)/lib -Wl,-Bstatic -lpng -Wl,-Bdynamic -lm -lpthread -ldl\r
 ASFLAGS = -mcpu=cortex-a8\r
 CC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
@@ -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 \\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/linux/in_evdev.o platform/linux/sndout_oss.o platform/linux/plat.o\r
+       platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.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
@@ -65,7 +70,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
@@ -86,13 +91,18 @@ 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
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
-$(error TODO)\r
 ifeq ($(VER),)\r
 $(error need VER)\r
 endif\r
 endif\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