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
drc: load ra before SD only when needed
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
335a03a
..
2b57053
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-58,6
+58,9
@@
OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
plugins/dfsound/registers.o plugins/dfsound/spu.o
plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
plugins/dfsound/xa.c
plugins/dfsound/registers.o plugins/dfsound/spu.o
plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
plugins/dfsound/xa.c
+ifeq "$(ARCH)" "arm"
+OBJS += plugins/dfsound/arm_utils.o
+endif
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
@@
-85,18
+88,20
@@
endif
OBJS += plugins/cdrcimg/cdrcimg.o
# dfinput
OBJS += plugins/cdrcimg/cdrcimg.o
# dfinput
-OBJS += plugins/dfinput/
pad
.o
+OBJS += plugins/dfinput/
main.o plugins/dfinput/pad.o plugins/dfinput/guncon
.o
# gui
OBJS += frontend/main.o frontend/plugin.o
# gui
OBJS += frontend/main.o frontend/plugin.o
+OBJS += frontend/plugin_lib.o frontend/common/readpng.o
+OBJS += frontend/common/fonts.o frontend/linux/plat.o
ifeq "$(USE_GTK)" "1"
OBJS += maemo/hildon.o maemo/main.o
maemo/%.o: maemo/%.c
else
ifeq "$(USE_GTK)" "1"
OBJS += maemo/hildon.o maemo/main.o
maemo/%.o: maemo/%.c
else
-OBJS += frontend/plugin_lib.o frontend/menu.o
+frontend/%.o: CFLAGS += -DVOUT_FBDEV
+OBJS += frontend/menu.o
OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.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
+OBJS += frontend/common/input.o frontend/linux/oshide.o
ifeq "$(ARCH)" "arm"
OBJS += frontend/plat_omap.o
OBJS += frontend/pandora.o
ifeq "$(ARCH)" "arm"
OBJS += frontend/plat_omap.o
OBJS += frontend/pandora.o
@@
-114,6
+119,10
@@
endif
ifdef PCNT
CFLAGS += -DPCNT
endif
ifdef PCNT
CFLAGS += -DPCNT
endif
+ifndef NO_TSLIB
+frontend/%.o: CFLAGS += -DHAVE_TSLIB
+OBJS += frontend/pl_gun_ts.o
+endif
frontend/%.o: CFLAGS += -DIN_EVDEV
frontend/menu.o: frontend/revision.h
frontend/%.o: CFLAGS += -DIN_EVDEV
frontend/menu.o: frontend/revision.h
@@
-128,7
+137,7
@@
$(TARGET): $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \
$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \
- plugins/gpu-gles/gpuGLES.so
+ plugins/gpu-gles/gpuGLES.so
plugins/gpu_neon/gpu_neon.so
$(PLUGINS):
make -C $(dir $@)
$(PLUGINS):
make -C $(dir $@)
@@
-155,4
+164,5
@@
rel: pcsx $(PLUGINS) \
sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml
rm out/pcsx.pxml.templ
mv out/*.so out/plugins/
sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml
rm out/pcsx.pxml.templ
mv out/*.so out/plugins/
+ mv out/plugins/gpu_neon.so out/plugins/gpuPEOPS2.so
$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i pandora/pcsx.png -c
$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i pandora/pcsx.png -c