X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=b25264b5bc844a47131c2bc7e26f9d401ef1de6b;hb=7f022a8d573295d721fd6a517c8f1fe04480a8f0;hp=4957a50d6e4e1a174614e5855afa9c0b3190d44c;hpb=bcf6c3497630d2ee44ee3015487ccf8ba5a84600;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 4957a50..b25264b 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -7,7 +7,7 @@ use_musashi = 1
 # profile = 1
 
 
-DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT -DIO_STATS # -DBENCHMARK
+DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT -DIO_STATS -DIN_EVDEV # -DBENCHMARK
 GCC = gcc
 STRIP = strip
 AS = gcc
@@ -27,25 +27,27 @@ COPT    += `pkg-config --cflags gthread-2.0`
 LDFLAGS += `pkg-config --libs gthread-2.0`
 
 # frontend
-OBJS += platform/gp2x/main.o platform/gp2x/menu.o platform/gp2x/emu.o platform/gp2x/usbjoy.o blit.o \
-		gp2x.o 940ctl_ym2612.o log_io.o
+OBJS += platform/gp2x/main.o platform/gp2x/menu.o platform/gp2x/emu.o usbjoy.o blit.o \
+		in_evdev.o sndout_oss.o gp2x.o 940ctl_ym2612.o log_io.o
 
 # common
-OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o \
-		platform/common/readpng.o platform/common/mp3_helix.o
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/config.o platform/common/fonts.o \
+		platform/common/readpng.o platform/common/input.o platform/common/mp3_helix.o
 
 # Pico
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \
-		Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \
+		pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
 # Pico - CD
-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/gfx_cd.o \
-		Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o
+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 \
+		pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
+# Pico - Pico
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - sound
-OBJS += Pico/sound/sound.o Pico/sound/sn76496.o Pico/sound/ym2612.o Pico/sound/mix.o
+OBJS += pico/sound/sound.o pico/sound/sn76496.o pico/sound/ym2612.o pico/sound/mix.o
 # Pico - carthw
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \
-		Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \
+		pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.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 zlib/uncompr.o
@@ -71,13 +73,14 @@ endif
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
-OBJS += Pico/Debug.o
+OBJS += pico/debugCPU.o
 OBJS += cpu/musashi/m68kdasm.o
 endif
 endif
+OBJS += cpu/musashi/m68kdasm.o
 
 vpath %.c = ../..
-DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/sound Pico/carthw/svp \
+DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
 	zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
 
 all: mkdirs PicoDrive
@@ -96,7 +99,9 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 mkdirs:
 	mkdir -p $(DIRS)
 
-Pico/carthw/svp/compiler.o : Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
+pico/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
+pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
 
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
@@ -119,7 +124,7 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
 
-Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
+pico/sound/ym2612.o : ../../pico/sound/ym2612.c
 	@echo ">>>" $@
 	$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@