notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for recent /gp2x changes
[picodrive.git]
/
platform
/
pandora
/
Makefile
diff --git
a/platform/pandora/Makefile
b/platform/pandora/Makefile
index
50c34d6
..
cde55c1
100644
(file)
--- a/
platform/pandora/Makefile
+++ b/
platform/pandora/Makefile
@@
-1,4
+1,5
@@
-export CROSS = arm-none-linux-gnueabi-
\r
+#export CROSS = arm-none-linux-gnueabi-
\r
+LIBROOT = /home/notaz/dev/pnd/libroot
\r
\r
# settings
\r
#mz80 = 1
\r
\r
# settings
\r
#mz80 = 1
\r
@@
-28,8
+29,8
@@
else
use_cyclone = 1
\r
endif
\r
\r
use_cyclone = 1
\r
endif
\r
\r
-DEFINC = -I../.. -I. -DARM -DPANDORA
\r
-COPT_COMMON = -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a
\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
else
\r
ifeq ($(DEBUG),)
\r
COPT_COMMON += -O2 # -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
\r
else
\r
@@
-51,11
+52,13
@@
LD = $(CROSS)ld
OBJCOPY = $(CROSS)objcopy
\r
\r
# frontend
\r
OBJCOPY = $(CROSS)objcopy
\r
\r
# frontend
\r
-OBJS += pandora.o
main.o emu.o asm_utils.o platform/gp2x/menu.o platform/gp2x/usbjoy
.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
\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/readpng.o
\r
+ platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.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
\r
# Pico
\r
ifeq "$(amalgamate)" "1"
\r
@@
-119,7
+122,7
@@
endif
vpath %.c = ../..
\r
vpath %.s = ../..
\r
vpath %.S = ../..
\r
vpath %.c = ../..
\r
vpath %.s = ../..
\r
vpath %.S = ../..
\r
-DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
\r
+DIRS = platform platform/gp2x platform/
linux platform/
common pico pico/cd pico/pico pico/sound pico/carthw/svp \
\r
zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
\r
\r
\r
zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
\r
\r
\r
@@
-129,7
+132,7
@@
include ../common/common_arm.mak
\r
PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
\r
@echo ">>>" $@
\r
\r
PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
\r
@echo ">>>" $@
\r
- $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map
# -lpng
\r
+ $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map
-lpng -L$(LIBROOT)/lib -static
\r
ifeq ($(DEBUG),)
\r
$(STRIP) $@
\r
endif
\r
ifeq ($(DEBUG),)
\r
$(STRIP) $@
\r
endif
\r