skip junk in mp3_helix, refactor find_sync_word

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 01e4e3b..2e5a104 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,19 +1,21 @@
-export CROSS = arm-linux-\r
+CROSS ?= arm-linux-\r
 \r
 # settings\r
-#mz80 = 1\r
-#debug_cyclone = 1\r
+use_cyclone = 1\r
+#use_musashi = 1\r
+use_drz80 = 1\r
+use_sh2drc = 1\r
+#use_sh2mame = 1\r
+\r
 asm_memory = 1\r
 asm_render = 1\r
 asm_ym2612 = 1\r
 asm_misc = 1\r
 asm_cdpico = 1\r
 asm_cdmemory = 1\r
-amalgamate = 0\r
+asm_32xdraw = 1\r
 #profile = 1\r
-#use_musashi = 1\r
-use_sh2drc = 1\r
-drc_debug = 1\r
+#drc_debug = 3\r
 \r
 -include Makefile.local\r
 \r
@@ -25,22 +27,13 @@ ifeq "$(use_musashi)" "1"
 # due to CPU stop flag acces\r
 asm_cdpico = 0\r
 asm_cdmemory = 0\r
-else\r
-use_cyclone = 1\r
 endif\r
 \r
+ARCH = arm\r
 DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK\r
 CFLAGS += -Wall -Winline -I../.. -I.\r
 ifeq ($(DEBUG),)\r
 CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
-else\r
-CFLAGS += -ggdb\r
-endif\r
-ifeq "$(profile)" "1"\r
-CFLAGS += -fprofile-generate\r
-endif\r
-ifeq "$(profile)" "2"\r
-CFLAGS += -fprofile-use\r
 endif\r
 CFLAGS += -mcpu=arm920t -mtune=arm920t\r
 ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
@@ -57,96 +50,37 @@ OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o soc_dummy.o em
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
+# ARM stuff\r
+OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
+OBJS += pico/sound/mix_arm.o\r
+\r
 # common\r
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
        platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \\r
-       platform/common/mp3_helix.o platform/common/input.o platform/common/main.o \\r
+       platform/common/mp3_helix.o platform/common/input.o platform/common/main.o platform/common/mp3.o \\r
        platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o\r
 \r
-# Pico\r
-ifeq "$(amalgamate)" "1"\r
-OBJS += ../../picoAll.o\r
-else\r
-OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \\r
-       pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o \\r
-       pico/misc.o pico/eeprom.o pico/patch.o pico/debug.o\r
-# Pico - CD\r
-OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \\r
-               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
-OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
-               pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
-\r
-# Pico - sound\r
-ifneq "$(amalgamate)" "1"\r
-OBJS += pico/sound/sound.o\r
-endif\r
-OBJS += pico/sound/mix_arm.o\r
-OBJS += pico/sound/sn76496.o pico/sound/ym2612.o\r
 # unzip\r
 OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # zlib\r
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
        zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o\r
-# debug\r
-ifeq "$(debug_cyclone)" "1"\r
-OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
-endif\r
-# CPU cores\r
-ifeq "$(use_musashi)" "1"\r
-DEFINES += EMU_M68K\r
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
-endif\r
-ifeq "$(use_cyclone)" "1"\r
-DEFINES += EMU_C68K\r
-OBJS += pico/m68kif_cyclone.o cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
-endif\r
-ifeq "$(mz80)" "1"\r
-DEFINES += _USE_MZ80\r
-OBJS += cpu/mz80/mz80.o\r
-else\r
-DEFINES += _USE_DRZ80\r
-OBJS += cpu/DrZ80/drz80.o\r
-endif\r
-OBJS += cpu/sh2/sh2.o\r
-ifeq "$(use_sh2drc)" "1"\r
-DEFINES += DRC_SH2 DRC_TMP\r
-OBJS += cpu/sh2/mame/sh2pico.o\r
-OBJS += cpu/sh2/compiler.o\r
-OBJS += cpu/sh2/stub_arm.o\r
-ifdef drc_debug\r
-DEFINES += DRC_DEBUG=$(drc_debug)\r
-OBJS += cpu/sh2/mame/sh2dasm.o\r
-OBJS += platform/linux/host_dasm.o\r
-LDFLAGS += -lbfd -lopcodes -liberty\r
-endif\r
-else\r
-OBJS += cpu/sh2/mame/sh2pico.o\r
-endif\r
-OBJS += cpu/drc/cmn.o\r
-\r
-CFLAGS += $(addprefix -D,$(DEFINES))\r
 \r
 vpath %.c = ../..\r
 vpath %.s = ../..\r
 vpath %.S = ../..\r
 \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 cpu/sh2/mame cpu/drc\r
+DIRS += platform/gp2x platform/linux zlib unzip \r
 \r
 \r
 all: mkdirs PicoDrive\r
 \r
+include ../common/common.mak\r
 include ../common/common_arm.mak\r
 include ../common/revision.mak\r
 \r
+CFLAGS += $(addprefix -D,$(DEFINES))\r
+\r
 # partial linking helps profiled builds due to section merging\r
 PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        $(LD) -r -o $@ $^\r