X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=c6f9fe936524e76adcdb09d30d1bb4f1f9005ec4;hb=31a77bded36b72459ab1e203f48c8760c83435ed;hp=f698a8f7379fcc37efd56a8e867da8d8d3f46a3c;hpb=90014ab45fb805fafdc866eed02f644d882cf32a;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index f698a8f..c6f9fe9 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -13,7 +13,7 @@ asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
 asm_cdmemory = 1
-amalgamate = 1
+amalgamate = 0
 #profile = 1
 #use_musashi = 1
 #up = 1
@@ -32,7 +32,7 @@ use_cyclone = 1
 endif
 
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-COPT_COMMON = -static -Wall -O3 -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s
+COPT_COMMON = -static -Wall -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math -Winline
 ifeq "$(profile)" "1"
 COPT_COMMON += -fprofile-generate
 endif
@@ -48,10 +48,13 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 # 940 core control
 OBJS += 940ctl.o
 
+# common
+OBJS += ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o
+
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o
@@ -148,7 +151,7 @@ up: PicoDrive.gpe
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
 
-testrefr.gpe : test.o gp2x.o asmutils.o
+testrefr.gpe : test.o gp2x.o
 	@echo $@
 	@$(GCC) $(COPT) $^ -o $@
 	@$(STRIP) $@