further unification and refactoring

[libpicofe.git] / pandora / Makefile

diff --git a/pandora/Makefile b/pandora/Makefile
index 045fd52..cde55c1 100644 (file)
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -29,7 +29,7 @@ else
 use_cyclone = 1\r
 endif\r
 \r
-DEFINC = -I../.. -I. -DARM -DPANDORA\r
+DEFINC = -I../.. -I. -DARM -DPANDORA -DIN_EVDEV\r
 COPT_COMMON = -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a -I$(LIBROOT)/include\r
 ifeq ($(DEBUG),)\r
 COPT_COMMON += -O2 # -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
@@ -52,12 +52,13 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += pandora.o main.o emu.o asm_utils.o platform/gp2x/menu.o\r
+OBJS += pandora.o emu.o asm_utils.o plat.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/mp3_helix.o platform/common/arm_linux.o \\r
-       platform/common/readpng.o platform/linux/usbjoy.o platform/linux/sndout_oss.o\r
+       platform/common/readpng.o platform/common/input.o platform/common/main.o \\r
+       platform/linux/in_evdev.o platform/linux/sndout_oss.o platform/linux/plat.o\r
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
@@ -131,7 +132,7 @@ include ../common/common_arm.mak
 \r
 PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
        @echo ">>>" $@\r
-       $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map -lpng -L$(LIBROOT)/lib\r
+       $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map -lpng -L$(LIBROOT)/lib -static\r
 ifeq ($(DEBUG),)\r
        $(STRIP) $@\r
 endif\r