32x: preliminary PWM implementation. 32x opts in menu

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 817237a..fedadf3 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -3,12 +3,12 @@ export CROSS = arm-linux-
 # settings\r
 #mz80 = 1\r
 #debug_cyclone = 1\r
-#asm_memory = 1 # TODO\r
+asm_memory = 1\r
 asm_render = 1\r
 asm_ym2612 = 1\r
 asm_misc = 1\r
 asm_cdpico = 1\r
-#asm_cdmemory = 1 # TODO\r
+asm_cdmemory = 1\r
 amalgamate = 0\r
 #profile = 1\r
 #use_musashi = 1\r
@@ -72,6 +72,8 @@ OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
                pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \\r
                pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o\r
 endif\r
+# Pico - 32X\r
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o\r
 # Pico - Pico\r
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
 # Pico - carthw\r
@@ -100,7 +102,7 @@ OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 endif\r
 ifeq "$(use_cyclone)" "1"\r
 DEFINC += -DEMU_C68K\r
-OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
+OBJS += pico/m68kif_cyclone.o cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
 endif\r
 ifeq "$(mz80)" "1"\r
 DEFINC += -D_USE_MZ80\r
@@ -114,8 +116,9 @@ vpath %.c = ../..
 vpath %.s = ../..\r
 vpath %.S = ../..\r
 \r
-DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound \\r
-       pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \\r
+       pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \\r
+       cpu/mz80 cpu/DrZ80\r
 \r
 \r
 all: mkdirs PicoDrive\r