further prep for Wiz port. Cleanups, rm cpuctrl mmuhack; add warm

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 625e679..01dbaf4 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -32,7 +32,8 @@ use_cyclone = 1
 endif\r
 \r
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X # -DBENCHMARK\r
-COPT_COMMON = -static -Wall -Winline\r
+COPT_COMMON = -Wall -Winline\r
+COPT_COMMON += -static\r
 ifeq ($(DEBUG),)\r
 COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 else\r
@@ -54,14 +55,14 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += main.o gp2x.o emu.o in_gp2x.o squidgehack.o cpuctrl.o\r
+OBJS += main.o soc.o soc_mmsp2.o soc_pollux.o emu.o in_gp2x.o plat.o warm.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
 # common\r
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
        platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \\r
-       platform/common/mp3_helix.o platform/common/input.o platform/linux/usbjoy.o \\r
+       platform/common/mp3_helix.o platform/common/input.o \\r
        platform/linux/sndout_oss.o platform/linux/plat.o\r
 \r
 # Pico\r