X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=cdfea3794e5ffa32dcf33d911362ebb06982398a;hb=8beb44303e3775fc574a92a558f5237bdd72fda3;hp=6de8dd9d1fe393c132e302f8cc92d8d27a5d110f;hpb=41397701210c08b9d25ca66cbe372c7ed86d6927;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 6de8dd9..cdfea37 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -1,8 +1,12 @@
-export CROSS = arm-linux-
+CROSS ?= arm-linux-
 
 # settings
-#mz80 = 1
-#debug_cyclone = 1
+use_cyclone = 1
+#use_musashi = 1
+use_drz80 = 1
+use_sh2drc = 1
+#use_sh2mame = 1
+
 asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
@@ -11,25 +15,23 @@ asm_cdpico = 1
 asm_cdmemory = 1
 amalgamate = 0
 #profile = 1
-#use_musashi = 1
-use_sh2mame = 1
-#up = 1
+#drc_debug = 3
 
+-include Makefile.local
 
 ifeq "$(debug_cyclone)" "1"
 use_cyclone = 1
 use_musashi = 1
 endif
 ifeq "$(use_musashi)" "1"
+# due to CPU stop flag acces
 asm_cdpico = 0
-asm_memory = 0
 asm_cdmemory = 0
-else
-use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK
-CFLAGS += -Wall -Winline
+ARCH = arm
+DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK
+CFLAGS += -Wall -Winline -I../.. -I.
 ifeq ($(DEBUG),)
 CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math
 else
@@ -42,8 +44,9 @@ ifeq "$(profile)" "2"
 CFLAGS += -fprofile-use
 endif
 CFLAGS += -mcpu=arm920t -mtune=arm920t
-SFLAGS = $(CFLAGS)
 ASFLAGS = -mcpu=arm920t -mfloat-abi=soft
+LDFLAGS += -lm -lpng
+
 CC = $(CROSS)gcc
 STRIP = $(CROSS)strip
 AS = $(CROSS)as
@@ -51,7 +54,7 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o emu.o in_gp2x.o
+OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o soc_dummy.o emu.o in_gp2x.o
 # 940 core control
 OBJS += 940ctl.o
 
@@ -92,33 +95,8 @@ OBJS += unzip/unzip.o unzip/unzip_stream.o
 # 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
-# debug
-ifeq "$(debug_cyclone)" "1"
-OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o
-endif
-# CPU cores
-ifeq "$(use_musashi)" "1"
-DEFINC += -DEMU_M68K
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
-endif
-ifeq "$(use_cyclone)" "1"
-DEFINC += -DEMU_C68K
-OBJS += pico/m68kif_cyclone.o cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
-endif
-ifeq "$(mz80)" "1"
-DEFINC += -D_USE_MZ80
-OBJS += cpu/mz80/mz80.o
-else
-DEFINC += -D_USE_DRZ80
-OBJS += cpu/DrZ80/drz80.o
-endif
-OBJS += cpu/sh2/sh2.o
-ifeq "$(use_sh2mame)" "1"
-OBJS += cpu/sh2/mame/sh2pico.o
-else
-endif
-OBJS += cpu/drc/cmn.o
-OBJS += cpu/drc/cmn_arm.o
+
+CFLAGS += $(addprefix -D,$(DEFINES))
 
 vpath %.c = ../..
 vpath %.s = ../..
@@ -131,6 +109,7 @@ DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/p
 
 all: mkdirs PicoDrive
 
+include ../common/common.mak
 include ../common/common_arm.mak
 include ../common/revision.mak
 
@@ -142,7 +121,7 @@ PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 # also libm on F100 is not compatible
 PicoDrive : PicoDrive.o
 	@echo ">>>" $@
-	$(CC) -static -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=$@.map
+	$(CC) -static -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=$@.map
 ifeq ($(DEBUG),)
 	$(STRIP) $@
 endif