giz port, restructuring

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 0eee0eb..65565f1 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -32,7 +32,12 @@ use_cyclone = 1
 endif\r
 \r
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
-COPT_COMMON = -static -Wall -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+COPT_COMMON = -static -Wall -Winline\r
+ifeq ($(DEBUG),)\r
+COPT_COMMON += -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+else\r
+COPT_COMMON += -ggdb\r
+endif\r
 ifeq "$(profile)" "1"\r
 COPT_COMMON += -fprofile-generate\r
 endif\r
@@ -48,10 +53,13 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o\r
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
+# common\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
+\r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
 OBJS += ../../PicoAll.o\r
@@ -148,7 +156,7 @@ up: PicoDrive.gpe
 #      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
 \r
-testrefr.gpe : test.o gp2x.o asmutils.o\r
+testrefr.gpe : test.o gp2x.o\r
        @echo $@\r
        @$(GCC) $(COPT) $^ -o $@\r
        @$(STRIP) $@\r
@@ -175,7 +183,7 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
-../../Pico/misc_asm.o : ../../Pico/misc.s\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
@@ -184,7 +192,7 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../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
+../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
 \r