X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2FMakefile;h=02ef6091d7637fc763577013e087161cbfc132dc;hb=7fd581f40bb5273e81dc08afdd55224c26c8fb9e;hp=ba9bbcb08da0771468b0e28d963680e4bde65443;hpb=095a240bd91548be4b9770d28d5d6c3e97637094;p=libpicofe.git

diff --git a/pandora/Makefile b/pandora/Makefile
index ba9bbcb..02ef609 100644
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -1,4 +1,5 @@
-export CROSS = arm-none-linux-gnueabi-
+#export CROSS = arm-none-linux-gnueabi-
+LIBROOT = /home/notaz/dev/pnd/libroot
 
 # settings
 #mz80 = 1
@@ -28,8 +29,8 @@ else
 use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -DPANDORA
-COPT_COMMON = -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a
+DEFINC = -I../.. -I. -DARM -DPANDORA -DIN_EVDEV
+COPT_COMMON = -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a -I$(LIBROOT)/include
 ifeq ($(DEBUG),)
 COPT_COMMON += -O2 # -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
 else
@@ -51,12 +52,13 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += pandora.o main.o emu.o asm_utils.o platform/gp2x/menu.o platform/gp2x/usbjoy.o
+OBJS += pandora.o main.o emu.o asm_utils.o plat.o
 
 # common
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
-	platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o
-	# platform/common/readpng.o
+	platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o \
+	platform/common/readpng.o platform/common/input.o platform/linux/in_evdev.o \
+	platform/linux/sndout_oss.o platform/linux/plat.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
@@ -120,7 +122,7 @@ endif
 vpath %.c = ../..
 vpath %.s = ../..
 vpath %.S = ../..
-DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
 	zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
 
 
@@ -130,7 +132,7 @@ include ../common/common_arm.mak
 
 PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
-	$(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map # -lpng
+	$(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map -lpng -L$(LIBROOT)/lib -static
 ifeq ($(DEBUG),)
 	$(STRIP) $@
 endif