notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release r6
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
5896158
..
db8e1f6
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,15
+6,17
@@
LD = $(CROSS_COMPILE)ld
ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
CFLAGS += -ggdb -Ifrontend
ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
CFLAGS += -ggdb -Ifrontend
-LDFLAGS += -lz -lpthread -ldl -lpng
+LDFLAGS += -lz -lpthread -ldl -lpng
-lbz2
ifeq "$(ARCH)" "arm"
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
endif
ifndef DEBUG
ifeq "$(ARCH)" "arm"
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
endif
ifndef DEBUG
-CFLAGS += -O2
#
-DNDEBUG
+CFLAGS += -O2 -DNDEBUG
endif
endif
-USE_OSS = 1
+CFLAGS += $(EXTRA_CFLAGS)
+
+USE_OSS ?= 1
#USE_ALSA = 1
#DRC_DBG = 1
#PCNT = 1
#USE_ALSA = 1
#DRC_DBG = 1
#PCNT = 1
@@
-44,8
+46,8
@@
CFLAGS += -DDRC_DBG
endif
# spu
endif
# spu
-OBJS += plugins/dfsound/
adsr.o plugins/dfsound/dma.o plugins/dfsound/reverb.o plugins/dfsound/xa
.o \
- plugins/dfsound/
freeze.o plugins/dfsound/cfg.o plugins/dfsound/
registers.o plugins/dfsound/spu.o
+OBJS += plugins/dfsound/
dma.o plugins/dfsound/freeze
.o \
+ plugins/dfsound/registers.o plugins/dfsound/spu.o
ifeq "$(USE_OSS)" "1"
plugins/dfsound/%.o: CFLAGS += -DUSEOSS
OBJS += plugins/dfsound/oss.o
ifeq "$(USE_OSS)" "1"
plugins/dfsound/%.o: CFLAGS += -DUSEOSS
OBJS += plugins/dfsound/oss.o
@@
-65,22
+67,32
@@
OBJS += plugins/dfxvideo/draw.o
else
OBJS += plugins/dfxvideo/draw_fb.o
endif
else
OBJS += plugins/dfxvideo/draw_fb.o
endif
+
# cdrcimg
plugins/cdrcimg/%.o: CFLAGS += -Wall
OBJS += plugins/cdrcimg/cdrcimg.o
# gui
# cdrcimg
plugins/cdrcimg/%.o: CFLAGS += -Wall
OBJS += plugins/cdrcimg/cdrcimg.o
# gui
-OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o
-OBJS += frontend/menu.o
+OBJS += frontend/main.o frontend/plugin.o
+ifeq "$(USE_GTK)" "1"
+OBJS += maemo/hildon.o maemo/main.o
+maemo/%.o: maemo/%.c
+maemo/%.o: CFLAGS += -Wall
+else
+OBJS += frontend/plugin_lib.o frontend/menu.o
OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
OBJS += frontend/linux/plat.o frontend/linux/oshide.o
OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o
ifeq "$(ARCH)" "arm"
OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
OBJS += frontend/linux/plat.o frontend/linux/oshide.o
OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o
ifeq "$(ARCH)" "arm"
-OBJS += frontend/arm_utils.o
OBJS += frontend/plat_omap.o
OBJS += frontend/plat_omap.o
+OBJS += frontend/pandora.o
else
OBJS += frontend/plat_dummy.o
endif
else
OBJS += frontend/plat_dummy.o
endif
+endif # !USE_GTK
+ifeq "$(ARCH)" "arm"
+OBJS += frontend/arm_utils.o
+endif
ifdef X11
frontend/%.o: CFLAGS += -DX11
OBJS += frontend/xkb.o
ifdef X11
frontend/%.o: CFLAGS += -DX11
OBJS += frontend/xkb.o