X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=gp2x%2FMakefile;h=42f6fcbe1b5d3713ef5ad4f70274b52e3d0c2515;hb=199bec61013575bcc73c75fd8338bd44d82bf65f;hp=7b827b5639cf0d4da90b447943d56f3e0ecf200d;hpb=6bca8b11d8a114d7344080e9baac243a8ce0b5ee;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 7b827b5..42f6fcb 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -3,15 +3,16 @@ 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
+use_sh2mame = 1
 #up = 1
 
 
@@ -73,7 +74,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
@@ -111,6 +112,10 @@ else
 DEFINC += -D_USE_DRZ80
 OBJS += cpu/DrZ80/drz80.o
 endif
+ifeq "$(use_sh2mame)" "1"
+OBJS += cpu/sh2mame/sh2pico.o
+else
+endif
 
 vpath %.c = ../..
 vpath %.s = ../..
@@ -118,7 +123,7 @@ vpath %.S = ../..
 
 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/mz80 cpu/DrZ80 cpu/sh2mame
 
 
 all: mkdirs PicoDrive