X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=bcaa1d08a36e1b71f07dbbb71e8546ff7a5c85c5;hb=274f95a9a9e5a889ee137a7cbd764a384a7ac2dd;hp=8ccea308f35c676fc83084ec115549b215c1bce1;hpb=974fdb5bfda8ed006661031e22c920828ddb60dc;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 8ccea30..bcaa1d0 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -3,16 +3,17 @@ export CROSS = arm-linux-
 # settings
 #mz80 = 1
 #debug_cyclone = 1
-#asm_memory = 1 # TODO
+asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
-#asm_cdmemory = 1 # TODO
+asm_cdmemory = 1
 amalgamate = 0
 #profile = 1
 #use_musashi = 1
-#up = 1
+use_sh2drc = 1
+drc_debug = 1
 
 
 ifeq "$(debug_cyclone)" "1"
@@ -27,8 +28,8 @@ else
 use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK
-CFLAGS += -Wall -Winline
+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
@@ -41,8 +42,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
@@ -50,7 +52,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
 
@@ -73,7 +75,7 @@ OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
 		pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
 endif
 # Pico - 32X
-OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o
 # Pico - Pico
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - carthw
@@ -97,27 +99,46 @@ OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o
 endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
-DEFINC += -DEMU_M68K
+DEFINES += EMU_M68K
 OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 endif
 ifeq "$(use_cyclone)" "1"
-DEFINC += -DEMU_C68K
-OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
+DEFINES += EMU_C68K
+OBJS += pico/m68kif_cyclone.o cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
 endif
 ifeq "$(mz80)" "1"
-DEFINC += -D_USE_MZ80
+DEFINES += _USE_MZ80
 OBJS += cpu/mz80/mz80.o
 else
-DEFINC += -D_USE_DRZ80
+DEFINES += _USE_DRZ80
 OBJS += cpu/DrZ80/drz80.o
 endif
+OBJS += cpu/sh2/sh2.o
+ifeq "$(use_sh2drc)" "1"
+DEFINES += DRC_SH2 DRC_TMP
+OBJS += cpu/sh2/mame/sh2pico.o
+OBJS += cpu/sh2/compiler.o
+OBJS += cpu/sh2/stub_arm.o
+ifeq "$(drc_debug)" "1"
+DEFINES += DRC_DEBUG=1
+OBJS += cpu/sh2/mame/sh2dasm.o
+OBJS += platform/linux/host_dasm.o
+LDFLAGS += -lbfd -lopcodes -liberty
+endif
+else
+OBJS += cpu/sh2/mame/sh2pico.o
+endif
+OBJS += cpu/drc/cmn.o
+
+CFLAGS += $(addprefix -D,$(DEFINES))
 
 vpath %.c = ../..
 vpath %.s = ../..
 vpath %.S = ../..
 
-DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound \
-	pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \
+	pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \
+	cpu/mz80 cpu/DrZ80 cpu/sh2/mame cpu/drc
 
 
 all: mkdirs PicoDrive
@@ -133,7 +154,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