UIQ3 update, some makefile unification, rm old configs, stuff

[picodrive.git] / platform / gp2x / Makefile

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 57bd810..06761a3 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -44,16 +44,17 @@ endif
 ifeq "$(profile)" "2"\r
 COPT_COMMON += -fprofile-use\r
 endif\r
-COPT = $(COPT_COMMON) -mtune=arm920t\r
-ASOPT = -mcpu=arm920t -mfloat-abi=soft\r
-GCC = $(CROSS)gcc\r
+CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t\r
+SFLAGS = $(CFLAGS)\r
+ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
+CC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
 LD = $(CROSS)ld\r
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o\r
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o asm_utils.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
@@ -149,7 +150,7 @@ all: mkdirs PicoDrive.gpe
 \r
 PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
-       $(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
+       $(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
 ifeq ($(DEBUG),)\r
        $(STRIP) $@\r
 endif\r
@@ -168,75 +169,10 @@ tidy:
 #      @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
 \r
 \r
-clean_prof:\r
-       find ../.. -name '*.gcno' -delete\r
-       find ../.. -name '*.gcda' -delete\r
-\r
-\r
-mkdirs:\r
-       mkdir -p $(DIRS)\r
-\r
-.c.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-.s.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-.S.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
-\r
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c\r
-\r
-Pico/draw_asm.o : ../../Pico/Draw.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/draw2_asm.o : ../../Pico/Draw2.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/memory_asm.o : ../../Pico/Memory.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/misc_asm.o : ../../Pico/Misc.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
-       @echo ">>>" $<\r
-       $(AS) $(ASOPT) $< -o $@\r
-\r
-# build Cyclone\r
-../../cpu/Cyclone/proj/Cyclone.s :\r
-       @echo building Cyclone...\r
-       @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
-\r
-../../cpu/musashi/m68kops.c :\r
-       @make -C ../../cpu/musashi\r
-\r
-Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h\r
-Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h\r
-\r
-# build helix libs\r
-../common/helix/$(CROSS)helix-mp3.a:\r
-       make -C ../common/helix clean all\r
-\r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ GP2X\r
 \r
-../../tools/textfilter: ../../tools/textfilter.c\r
-       make -C ../../tools/ textfilter\r
-\r
+include ../common/common_arm.mak\r
 \r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r