misc gp2x tweaks

[libpicofe.git] / common / common_arm.mak

diff --git a/common/common_arm.mak b/common/common_arm.mak
index 5308fb3..11270a3 100644 (file)
--- a/common/common_arm.mak
+++ b/common/common_arm.mak
@@ -1,10 +1,38 @@
+# asm stuff
+ifeq "$(asm_render)" "1"
+DEFINES += _ASM_DRAW_C
+OBJS += pico/draw_arm.o pico/draw2_arm.o
+endif
+ifeq "$(asm_memory)" "1"
+DEFINES += _ASM_MEMORY_C
+OBJS += pico/memory_arm.o
+endif
+ifeq "$(asm_ym2612)" "1"
+DEFINES += _ASM_YM2612_C
+OBJS += pico/sound/ym2612_arm.o
+endif
+ifeq "$(asm_misc)" "1"
+DEFINES += _ASM_MISC_C
+OBJS += pico/misc_arm.o
+OBJS += pico/cd/misc_arm.o
+endif
+ifeq "$(asm_cdpico)" "1"
+DEFINES += _ASM_CD_PICO_C
+OBJS += pico/cd/pico_arm.o
+endif
+ifeq "$(asm_cdmemory)" "1"
+DEFINES += _ASM_CD_MEMORY_C
+OBJS += pico/cd/memory_arm.o
+endif
+
+
 .c.o:
        @echo ">>>" $<
-       $(CC) $(CFLAGS) $(DEFINC) -c $< -o $@
+       $(CC) $(CFLAGS) -c $< -o $@
 
 .S.o:
        @echo ">>>" $<
-       $(CC) $(SFLAGS) $(DEFINC) -c $< -o $@
+       $(CC) $(CFLAGS) -c $< -o $@
 
 
 ../../tools/textfilter: ../../tools/textfilter.c
@@ -17,48 +45,6 @@ clean_prof:
 mkdirs:
        mkdir -p $(DIRS)
 
-# deps
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
-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
-
-# individual rules
-Pico/draw_asm.o : ../../Pico/Draw.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/draw2_asm.o : ../../Pico/Draw2.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/memory_asm.o : ../../Pico/Memory.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/misc_asm.o : ../../Pico/Misc.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
-       @echo ">>>" $@
-       $(AS) $(ASFLAGS) $< -o $@
-#Pico/carthw/svp/stub_arm.o : ../../Pico/carthw/svp/stub_arm.S
-#      @echo ">>>" $@
-#      $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@
-
-# build Cyclone
-cpu/Cyclone/proj/Cyclone.s:
-       @echo building Cyclone...
-       @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
-
 # build helix libs
 ../common/helix/$(CROSS)helix-mp3.a:
        make -C ../common/helix clean all