X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=9a9c9f16a6eb717c0647ab5f227041e5dd64331e;hb=68af34fe20d7d9658100668f86a87bf73506bcb4;hp=f36aaadb8cef34c11d95688349059c9046b7eb43;hpb=fc11dd059b5c7369a51ddcca532505b588bd0030;p=picodrive.git

diff --git a/Makefile b/Makefile
index f36aaad..9a9c9f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,15 @@
 TARGET ?= PicoDrive
 CFLAGS += -Wall -ggdb -falign-functions=2
 CFLAGS += -I.
-# FIXME
-CFLAGS += -Iplatform/linux/
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
+#CFLAGS += -DEVT_LOG
+#CFLAGS += -DDRC_CMP
+#cpu_cmp = 1
+#drc_debug = 7
+#profile = 1
+
 
 all: config.mak target_
 
@@ -41,16 +45,11 @@ asm_mix ?= 1
 else # if not arm
 use_fame ?= 1
 use_cz80 ?= 1
-use_sh2mame ?= 1
 endif
 
-#drc_debug = 3
-#drc_debug_interp = 1
-#profile = 1
-
 -include Makefile.local
 
-ifeq "$(use_musashi)" "1"
+ifneq "$(use_cyclone)" "1"
 # due to CPU stop flag access
 asm_cdpico = 0
 asm_cdmemory = 0
@@ -74,6 +73,23 @@ OBJS += platform/libpicofe/linux/xenv.o
 OBJS += platform/libpicofe/pandora/plat.o
 USE_FRONTEND = 1
 endif
+ifeq "$(PLATFORM)" "gp2x"
+OBJS += platform/common/arm_utils.o 
+OBJS += platform/libpicofe/gp2x/in_gp2x.o
+OBJS += platform/libpicofe/gp2x/soc.o 
+OBJS += platform/libpicofe/gp2x/soc_mmsp2.o 
+OBJS += platform/libpicofe/gp2x/soc_pollux.o 
+OBJS += platform/libpicofe/gp2x/plat.o 
+OBJS += platform/libpicofe/gp2x/pollux_set.o 
+OBJS += platform/gp2x/940ctl.o 
+OBJS += platform/gp2x/plat.o 
+OBJS += platform/gp2x/emu.o 
+OBJS += platform/gp2x/vid_mmsp2.o 
+OBJS += platform/gp2x/vid_pollux.o 
+OBJS += platform/gp2x/warm.o 
+USE_FRONTEND = 1
+PLATFORM_MP3 = 1
+endif
 ifeq "$(PLATFORM)" "libretro"
 OBJS += platform/libretro.o 
 endif
@@ -111,7 +127,8 @@ endif
 endif # USE_FRONTEND
 
 OBJS += platform/common/mp3.o
-ifeq "$(HAVE_LIBAVCODEC)" "1"
+ifeq "$(PLATFORM_MP3)" "1"
+else ifeq "$(HAVE_LIBAVCODEC)" "1"
 OBJS += platform/common/mp3_libavcodec.o
 else
 OBJS += platform/common/mp3_dummy.o
@@ -151,36 +168,20 @@ tools/textfilter: tools/textfilter.c
 .s.o:
 	$(CC) $(CFLAGS) -c $< -o $@
 
+# special flags - perhaps fix this someday instead?
+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_file.o: CFLAGS += -fno-strict-aliasing
+pico/cd/pcm.o: CFLAGS += -fno-strict-aliasing
+pico/cd/LC89510.o: CFLAGS += -fno-strict-aliasing
+pico/cd/gfx_cd.o: CFLAGS += -fno-strict-aliasing
+
 # random deps
 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/pico_cmn.c pico/pico_int.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/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