X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=07ec24eda7a806b81df742a5a77544b0692ef2ea;hb=13b692eb4ee66fd0c7d4d45bdead750a4defa90e;hp=0af279c7af685d0e8ab6be42309d9a017913c164;hpb=5ecedd0cc2257b564dfcf68cb0e9d7d541bfc2b8;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 0af279c..07ec24e 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,13 +1,13 @@
 
 # settings
-#use_musashi = 1
-use_fame = 1
+use_musashi = 1
+#use_fame = 1
 #use_mz80 = 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 -DIN_GP2X -DFAKE_IN_GP2X # -DBENCHMARK
 GCC = gcc
 STRIP = strip
 AS = gcc
@@ -27,58 +27,69 @@ COPT    += `pkg-config --cflags gthread-2.0`
 LDFLAGS += `pkg-config --libs gthread-2.0`
 
 # frontend
-OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/emu.o ../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 \
+		platform/gp2x/in_gp2x.o
 
 # common
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/readpng.o ../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
 # 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
+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
 # unzip
-OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 endif
 ifeq "$(use_fame)" "1"
 DEFINC += -DEMU_F68K
-OBJS += ../../cpu/fame/famec.o
+OBJS += cpu/fame/famec.o
 endif
 # z80
 ifeq "$(use_mz80)" "1"
 DEFINC += -D_USE_MZ80
-OBJS += ../../cpu/mz80/mz80.o
+OBJS += cpu/mz80/mz80.o
 else
 DEFINC += -D_USE_CZ80
-OBJS += ../../cpu/cz80/cz80.o
+OBJS += cpu/cz80/cz80.o
 endif
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
-OBJS += ../../Pico/Debug.o
-OBJS += ../../cpu/musashi/m68kdasm.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/pico pico/sound pico/carthw/svp \
+	zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
 
-all: PicoDrive
+all: mkdirs PicoDrive
 clean: tidy
 	@$(RM) PicoDrive
 tidy:
-	@$(RM) $(OBJS)
+	$(RM) $(OBJS)
+	rm -rf $(DIRS)
 	@make -C ../../cpu/mz80/ clean
 	@make -C ../common/helix/ X86=1 clean
 
@@ -86,11 +97,17 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 	@echo ">>>" $@
 	$(GCC) $(COPT) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
+mkdirs:
+	mkdir -p $(DIRS)
+
+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
 
-../../cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
+cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 	@echo $@
 	@nasm -f elf $< -o $@
 
@@ -108,11 +125,11 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 	$(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 $@
 
-../../cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h
+cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h
 	@echo ">>>" $<
 	$(GCC) $(COPT) $(DEFINC) -Wno-unused -c $< -o $@