X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2FMakefile;h=c70c8353243b2c45b51a1d51576f78f2b8df8231;hb=b188c2b6d0448a9c328a9dcae5ba5c8c8b5273f3;hp=016a76ff4ee38728cdd87a6bd9ff82a621fe8f8e;hpb=492d353af951b6a34a1f62d07ec64456b6e34600;p=libpicofe.git

diff --git a/pandora/Makefile b/pandora/Makefile
index 016a76f..c70c835 100644
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -1,233 +1,94 @@
-export CROSS = arm-none-linux-gnueabi-
+#export CROSS = arm-none-linux-gnueabi-
+CROSS ?= $(CROSS_COMPILE)
+LIBROOT = /home/notaz/dev/pnd/libroot
 
 # settings
-#mz80 = 1
-#debug_cyclone = 1
+use_cyclone = 1
+#use_musashi = 1
+use_drz80 = 1
+use_sh2drc = 1
+#use_sh2mame = 1
+
 asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
 asm_cdmemory = 1
-amalgamate = 0
 #profile = 1
-#use_musashi = 1
-#up = 1
+#drc_debug = 3
 
+-include Makefile.local
 
-ifeq "$(debug_cyclone)" "1"
-use_cyclone = 1
-use_musashi = 1
-endif
 ifeq "$(use_musashi)" "1"
+# due to CPU stop flag acces
 asm_cdpico = 0
-asm_memory = 0
 asm_cdmemory = 0
-else
-use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -DPANDORA
-COPT_COMMON = -static -Wall -Winline
+ARCH = arm
+DEFINES += ARM PANDORA IN_EVDEV
+CFLAGS += -I../.. -I. -I$(LIBROOT)/include
+CFLAGS += -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a
 ifeq ($(DEBUG),)
-COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
-else
-COPT_COMMON += -ggdb
-endif
-ifeq "$(profile)" "1"
-COPT_COMMON += -fprofile-generate
+CFLAGS += -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math
 endif
-ifeq "$(profile)" "2"
-COPT_COMMON += -fprofile-use
-endif
-COPT = $(COPT_COMMON)
-ASOPT =
-GCC = $(CROSS)gcc
+LDFLAGS += -lm -lpng -L$(LIBROOT)/lib -static
+ASFLAGS = -mcpu=cortex-a8
+CC = $(CROSS)gcc
 STRIP = $(CROSS)strip
 AS = $(CROSS)as
 LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += pandora.o main.o emu.o platform/gp2x/menu.o platform/gp2x/usbjoy.o
+OBJS += pandora.o emu.o asm_utils.o
 
 # common
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
-	platform/common/arm_utils.o platform/common/mp3_helix.o # platform/common/readpng.o
-
-# Pico
-ifeq "$(amalgamate)" "1"
-OBJS += ../../PicoAll.o
-else
-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/cue.o Pico/cd/gfx_cd.o \
-		Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o
-endif
-# Pico - Pico
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.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 Pico/carthw/svp/stub_arm.o
-
-# asm stuff
-ifeq "$(asm_render)" "1"
-DEFINC += -D_ASM_DRAW_C
-OBJS += Pico/draw_asm.o Pico/draw2_asm.o
-endif
-ifeq "$(asm_memory)" "1"
-DEFINC += -D_ASM_MEMORY_C
-OBJS += Pico/memory_asm.o
-endif
-ifeq "$(asm_ym2612)" "1"
-DEFINC += -D_ASM_YM2612_C
-OBJS += Pico/sound/ym2612_asm.o
-endif
-ifeq "$(asm_misc)" "1"
-DEFINC += -D_ASM_MISC_C
-OBJS += Pico/misc_asm.o
-OBJS += Pico/cd/misc_asm.o
-endif
-ifeq "$(asm_cdpico)" "1"
-DEFINC += -D_ASM_CD_PICO_C
-OBJS += Pico/cd/pico_asm.o
-endif
-ifeq "$(asm_cdmemory)" "1"
-DEFINC += -D_ASM_CD_MEMORY_C
-OBJS += Pico/cd/memory_asm.o
-endif
+	platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o \
+	platform/common/readpng.o platform/common/input.o platform/common/main.o \
+	platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \
+	platform/linux/plat.o
+
+# ARM stuff
+OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
+OBJS += pico/sound/mix_arm.o
 
-# Pico - sound
-ifneq "$(amalgamate)" "1"
-OBJS += Pico/sound/sound.o
-endif
-OBJS += Pico/sound/mix_asm.o
-OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.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
 # unzip
 OBJS += unzip/unzip.o unzip/unzip_stream.o
-# debug
-ifeq "$(debug_cyclone)" "1"
-OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o
-endif
-# CPU cores
-ifeq "$(use_musashi)" "1"
-DEFINC += -DEMU_M68K
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
-endif
-ifeq "$(use_cyclone)" "1"
-DEFINC += -DEMU_C68K
-OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
-endif
-# drz80/mz80
-ifeq "$(mz80)" "1"
-DEFINC += -D_USE_MZ80
-OBJS += cpu/mz80/mz80.o
-else
-DEFINC += -D_USE_DRZ80
-OBJS += cpu/DrZ80/drz80.o
-endif
 
 vpath %.c = ../..
 vpath %.s = ../..
 vpath %.S = ../..
-DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
-	zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
-
+DIRS += platform/linux zlib unzip
 
 all: mkdirs PicoDrive
 
+include ../common/common.mak
+include ../common/common_arm.mak
+include ../common/revision.mak
+
+CFLAGS += $(addprefix -D,$(DEFINES))
+
 PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
-	$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng
+	$(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=PicoDrive.map
 ifeq ($(DEBUG),)
 	$(STRIP) $@
 endif
 
-
-# cleanup
 clean: tidy
 	$(RM) PicoDrive
 tidy:
 	$(RM) $(OBJS)
-#	rm -rf $(DIRS) # don't clean, gcda may be there
-#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
-
-
-clean_prof:
-	find ../.. -name '*.gcno' -delete
-	find ../.. -name '*.gcda' -delete
-
-
-mkdirs:
-	mkdir -p $(DIRS)
-
-.c.o:
-	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-.s.o:
-	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-.S.o:
-	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
-
-Pico/draw_asm.o : ../../Pico/Draw.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/draw2_asm.o : ../../Pico/Draw2.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/memory_asm.o : ../../Pico/Memory.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/misc_asm.o : ../../Pico/Misc.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-
-# build Cyclone
-../../cpu/Cyclone/proj/Cyclone.s :
-	@echo building Cyclone...
-	@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
-
-../../cpu/musashi/m68kops.c :
-	@make -C ../../cpu/musashi
-
-Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
-Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
-
-# build helix libs
-../common/helix/$(CROSS)helix-mp3.a:
-	make -C ../common/helix clean all
 
 readme.txt: ../../tools/textfilter ../base_readme.txt
 	../../tools/textfilter ../base_readme.txt $@ GP2X
 
-../../tools/textfilter: ../../tools/textfilter.c
-	make -C ../../tools/ textfilter
-
-
 # ----------- release -----------
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)
 $(error TODO)