revive pandora and win32 builds, rm gp2x dep for linux, lots of refactoring

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index cdfea37..9d8aa6a 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -13,7 +13,6 @@ asm_ym2612 = 1
 asm_misc = 1\r
 asm_cdpico = 1\r
 asm_cdmemory = 1\r
-amalgamate = 0\r
 #profile = 1\r
 #drc_debug = 3\r
 \r
@@ -34,14 +33,6 @@ DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK
 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
@@ -58,53 +49,27 @@ 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/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
 \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
@@ -113,6 +78,8 @@ include ../common/common.mak
 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