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

[picodrive.git] / platform / gizmondo / Makefile

diff --git a/platform/gizmondo/Makefile b/platform/gizmondo/Makefile
index e75c71c..0e37e2d 100644 (file)
--- a/platform/gizmondo/Makefile
+++ b/platform/gizmondo/Makefile
@@ -28,8 +28,9 @@ ifeq "$(profile)" "2"
 COPT_COMMON += -fprofile-use\r
 endif\r
 CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t\r
+SFLAGS = $(CFLAGS)\r
 ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
-GCC = $(CROSS)gcc\r
+CC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
 LD = $(CROSS)ld\r
@@ -115,7 +116,7 @@ all: mkdirs PicoDrive.exe readme.txt
 \r
 PicoDrive.exe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
-       $(GCC) -o $@ -static $(CFLAGS) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map \\r
+       $(CC) -o $@ -static $(CFLAGS) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map \\r
                2>&1 | grep -v ".idata$$4" # | grep -v "supports interworking, whereas"\r
 ifeq ($(DEBUG),)\r
        $(STRIP) $@\r
@@ -125,66 +126,10 @@ ifeq "$(profile)" "1"
 endif\r
 \r
 \r
-.c.o:\r
-       @echo ">>>" $<\r
-       $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@\r
-#.s.o:\r
-#      @echo $<\r
-#      $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@\r
-\r
-mkdirs:\r
-       mkdir -p $(DIRS)\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) $(ASFLAGS) $< -o $@\r
-Pico/draw2_asm.o : ../../Pico/Draw2.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/memory_asm.o : ../../Pico/Memory.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/misc_asm.o : ../../Pico/Misc.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
-       @echo ">>>" $@\r
-       @$(AS) $(ASFLAGS) $< -o $@\r
-Pico/carthw/svp/stub_arm.o : ../../Pico/carthw/svp/stub_arm.S\r
-       @echo ">>>" $@\r
-       $(GCC) $(CFLAGS) $(DEFINC) -c $< -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
-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 $@ GIZ\r
 \r
-../../tools/textfilter: ../../tools/textfilter.c\r
-       make -C ../../tools/ textfilter\r
+include ../common/common_arm.mak\r
 \r
 \r
 # cleanup\r
@@ -194,10 +139,6 @@ tidy:
        @$(RM) $(OBJS)\r
 \r
 \r
-clean_prof:\r
-       find ../.. -name '*.gcno' -delete\r
-       find ../.. -name '*.gcda' -delete\r
-\r
 up: PicoDrive.exe\r
        synce-pcp -d 3 PicoDrive.exe ":/SD Card/emus/PicoDrive/PicoDrive.exe"\r
 \r