X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=ca8ccf6e29a50384897feb8ede3915f56604df0e;hb=925254c3fe875acc5d36cb9e5ac2a64851f011f6;hp=439a66fd19c0573a8e2c88a8aa0ce6ed103e66be;hpb=75a30842c4f9e7e95a199361b9348c9f9dede0e6;p=picodrive.git

diff --git a/Makefile b/Makefile
index 439a66f..ca8ccf6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,31 @@
 TARGET ?= PicoDrive
-CFLAGS += -Wall -ggdb -falign-functions=2
-CFLAGS += -I.
-ifndef DEBUG
-CFLAGS += -O2 -DNDEBUG
+DEBUG = 0
+CFLAGS += -Wall 
+CFLAGS += -I. -DINLINE=inline
+
+ifeq ($(DEBUG),1)
+	CFLAGS += -g -O0
+else
+	ifeq ($(platform), vita)
+		CFLAGS += -O3 -DNDEBUG
+	else
+		CFLAGS += -O2 -DNDEBUG -ffunction-sections
+	endif
+endif
+
+ifneq ($(APPLE),1)
+	LDFLAGS += -Wl,--gc-sections
 endif
+
 #CFLAGS += -DEVT_LOG
 #CFLAGS += -DDRC_CMP
 #cpu_cmp = 1
 #drc_debug = 7
 #profile = 1
 
+ifeq ($(WANT_GDB),1)
+CFLAGS += ggdb -falign-functions=2
+endif
 
 all: config.mak target_
 
@@ -45,7 +61,6 @@ asm_mix ?= 1
 else # if not arm
 use_fame ?= 1
 use_cz80 ?= 1
-use_sh2mame ?= 1
 endif
 
 -include Makefile.local
@@ -56,7 +71,21 @@ asm_cdpico = 0
 asm_cdmemory = 0
 endif
 
-# frontend
+ifeq "$(PLATFORM)" "opendingux"
+opk: $(TARGET).opk
+
+$(TARGET).opk: $(TARGET)
+	$(RM) -rf .opk_data
+	cp -r platform/opendingux/data .opk_data
+	cp $< .opk_data/PicoDrive
+	$(STRIP) .opk_data/PicoDrive
+	mksquashfs .opk_data $@ -all-root -noappend -no-exports -no-xattrs
+
+OBJS += platform/opendingux/inputmap.o
+
+# OpenDingux is a generic platform, really.
+PLATFORM := generic
+endif
 ifeq "$(PLATFORM)" "generic"
 OBJS += platform/linux/emu.o platform/linux/blit.o # FIXME
 OBJS += platform/common/plat_sdl.o
@@ -66,6 +95,7 @@ USE_FRONTEND = 1
 endif
 ifeq "$(PLATFORM)" "pandora"
 platform/common/menu_pico.o: CFLAGS += -DPANDORA
+platform/libpicofe/linux/plat.o: CFLAGS += -DPANDORA
 OBJS += platform/pandora/plat.o
 OBJS += platform/pandora/asm_utils.o
 OBJS += platform/common/arm_utils.o 
@@ -92,7 +122,7 @@ USE_FRONTEND = 1
 PLATFORM_MP3 = 1
 endif
 ifeq "$(PLATFORM)" "libretro"
-OBJS += platform/libretro.o 
+OBJS += platform/libretro/libretro.o 
 endif
 
 ifeq "$(USE_FRONTEND)" "1"
@@ -135,11 +165,13 @@ else
 OBJS += platform/common/mp3_dummy.o
 endif
 
+ifneq "$(DONT_COMPILE_IN_ZLIB)" "1"
 # zlib
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 	zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o
 # unzip
 OBJS += unzip/unzip.o unzip/unzip_stream.o
+endif
 
 
 include platform/common/common.mak
@@ -156,9 +188,14 @@ target_: $(TARGET)
 
 clean:
 	$(RM) $(TARGET) $(OBJS)
+	$(RM) -r .opk_data
 
 $(TARGET): $(OBJS)
+ifeq ($(STATIC_LINKING), 1)
+	$(AR) rcs $@ $(OBJS)
+else
 	$(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) $(LDLIBS)
+endif
 
 pprof: platform/linux/pprof.c
 	$(CC) -O2 -ggdb -DPPROF -DPPROF_TOOL -I../../ -I. $^ -o $@
@@ -173,7 +210,7 @@ tools/textfilter: tools/textfilter.c
 pico/draw.o: CFLAGS += -fno-strict-aliasing
 pico/draw2.o: CFLAGS += -fno-strict-aliasing
 pico/mode4.o: CFLAGS += -fno-strict-aliasing
-pico/cd/memory.o: CFLAGS += -fno-strict-aliasing
+pico/cd/cd_memory.o: CFLAGS += -fno-strict-aliasing
 pico/cd/cd_file.o: CFLAGS += -fno-strict-aliasing
 pico/cd/pcm.o: CFLAGS += -fno-strict-aliasing
 pico/cd/LC89510.o: CFLAGS += -fno-strict-aliasing
@@ -183,32 +220,6 @@ pico/cd/gfx_cd.o: CFLAGS += -fno-strict-aliasing
 pico/carthw/svp/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/mame/sh2pico.o : cpu/sh2/mame/sh2.c
-pico/pico.o pico/cd/pico.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
-pico/memory.o pico/cd/memory.o : pico/pico_int.h pico/memory.h
+pico/pico.o pico/cd/mcd.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
+pico/memory.o pico/cd/cd_memory.o pico/32x/32x_memory.o : pico/pico_int.h pico/memory.h
 cpu/fame/famec.o: cpu/fame/famec.c cpu/fame/famec_opcodes.h
-
-# ----------- release -----------
-
-VER ?= $(shell head -n 1 platform/common/version.h | \
-	sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
-
-ifeq "$(PLATFORM)" "pandora"
-
-PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
-
-/tmp/readme.txt: tools/textfilter platform/base_readme.txt
-	tools/textfilter platform/base_readme.txt $@ PANDORA
-
-/tmp/PicoDrive.pxml: platform/pandora/PicoDrive.pxml.template
-	platform/pandora/make_pxml.sh $^ $@
-
-rel: PicoDrive platform/pandora/PicoDrive.run platform/pandora/picorestore \
-	pico/carthw.cfg /tmp/readme.txt platform/pandora/skin \
-	platform/pandora/PicoDrive.png platform/pandora/PicoDrive_p.png \
-	/tmp/PicoDrive.pxml
-	rm -rf out
-	mkdir out
-	cp -r $^ out/
-	$(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x out/PicoDrive.pxml -i out/PicoDrive.png -c
-
-endif