X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=bd612d6d891314d1e5dcebfb2bee2f19bb0186bd;hb=046c454067c66b783417f4a61ab1445d06412d66;hp=9a8f3df81d7b227dd9145b3c77ebda50c667989d;hpb=d9a189437aa503963b96fe382883723d40eebef6;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 9a8f3df..bd612d6 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,99 +1,139 @@
-
 # settings
-dprint = 1
-# profile = 1
-
+use_musashi = 1
+#use_fame = 1
+#use_mz80 = 1
+#profile = 1
+#fake_in_gp2x = 1
 
-DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-GCC = gcc
-STRIP = strip
-AS = gcc
+-include Makefile.local
 
 ifeq "$(profile)" "1"
-COPT_COMMON = -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math -fprofile-generate # -static
-COPT = $(COPT_COMMON) # -mtune=arm920t
+CFLAGS += -O3 -Wall
+CFLAGS += -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
+CFLAGS += -fprofile-generate
 else
-COPT = -ggdb -Wall -fno-strict-aliasing # -pg -O3  -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -ffast-math
-COPT_COMMON = $(COPT)
+CFLAGS = -ggdb -Wall
 endif
+DEFINES = _UNZIP_SUPPORT IO_STATS IN_EVDEV
+CFLAGS += -I../.. -I.
 
 # gtk
-COPT    += `pkg-config --cflags gtk+-2.0`
+CFLAGS  += `pkg-config --cflags gtk+-2.0`
 LDFLAGS += `pkg-config --libs gtk+-2.0`
-COPT    += `pkg-config --cflags gthread-2.0`
+CFLAGS  += `pkg-config --cflags gthread-2.0`
 LDFLAGS += `pkg-config --libs gthread-2.0`
 
 # frontend
-OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/fonts.o ../gp2x/emu.o ../gp2x/usbjoy.o blit.o gp2x.o 940ctl_ym2612.o
+OBJS += platform/gp2x/emu.o blit.o in_evdev.o plat.o sndout_oss.o gp2x.o log_io.o
+
+# common
+OBJS += platform/common/main.o platform/common/emu.o platform/common/menu.o \
+	platform/common/config.o platform/common/fonts.o platform/common/readpng.o \
+	platform/common/input.o
+
+ifeq "$(fake_in_gp2x)" "1"
+DEFINES += IN_GP2X FAKE_IN_GP2X
+OBJS += platform/gp2x/in_gp2x.o
+endif
+
 # Pico
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.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
-# mp3
-OBJS += ../gp2x/mp3.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # CPU cores
-DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kcpu.o  ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o \
-	../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o
-# mz80
-DEFINC += -D_USE_MZ80
-OBJS += ../../cpu/mz80/mz80.o
+ifeq "$(use_musashi)" "1"
+DEFINES += EMU_M68K
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
+endif
+ifeq "$(use_fame)" "1"
+DEFINES += EMU_F68K
+OBJS += cpu/fame/famec.o
+endif
+# z80
+ifeq "$(use_mz80)" "1"
+DEFINES += _USE_MZ80
+OBJS += cpu/mz80/mz80.o
+else
+DEFINES += _USE_CZ80
+OBJS += cpu/cz80/cz80.o
+endif
+# misc
+ifeq "$(use_fame)" "1"
+ifeq "$(use_musashi)" "1"
+OBJS += pico/debugCPU.o
+OBJS += cpu/musashi/m68kdasm.o
+endif
+endif
+OBJS += cpu/musashi/m68kdasm.o
+
+CFLAGS += $(addprefix -D,$(DEFINES))
 
-# faked asm
-#DEFINC += -D_ASM_DRAW_C
-#DEFINC += -D_ASM_MEMORY_C
-#DEFINC += -D_ASM_YM2612_C
-OBJS += fakedasm.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 ../gp2x/helix/ X86=1 clean
+	@make -C ../common/helix/ X86=1 clean
 
-PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
-	@echo $@
-	@$(GCC) $(COPT) $^ $(LDFLAGS) -lm -Wl,-Map=PicoDrive.map -o $@
+PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
+	@echo ">>>" $@
+	$(CC) $(CFLAGS) $^ $(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/mz80/mz80.o : ../../cpu/mz80/mz80.asm
+../../cpu/musashi/m68kops.c :
+	@make -C ../../cpu/musashi
+
+cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 	@echo $@
 	@nasm -f elf $< -o $@
 
 ../../cpu/mz80/mz80.asm :
 	@make -C ../../cpu/mz80/
 
-../gp2x/helix/helix_mp3_x86.a:
-	@make -C ../gp2x/helix/ X86=1 clean all
+../common/helix/helix_mp3_x86.a:
+	@make -C ../common/helix/ X86=1 clean all
 
 .c.o:
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -c $< -o $@
 .s.o:
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -c $< -o $@
 
 
-../../Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
-	@echo $@
-	@$(GCC) $(COPT_COMMON) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@ # -mtune=arm940t
+#pico/sound/ym2612.o : ../../pico/sound/ym2612.c
+#	@echo ">>>" $@
+#	$(CC) $(CFLAGS) -c $< -o $@
 
-# faked asm
-../../Pico/Draw.o : ../../Pico/Draw.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@
+cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -Wno-unused -c $< -o $@