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
cdrom: merge a fix from PCSX-Reloaded
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
95bc0f2
..
2c2767a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-52,7
+52,9
@@
endif
# spu
OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
plugins/dfsound/registers.o plugins/dfsound/spu.o
# spu
OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
plugins/dfsound/registers.o plugins/dfsound/spu.o
-plugins/dfsound/spu.o: plugins/dfsound/xa.c
+plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
+ plugins/dfsound/xa.c
+plugins/dfsound/%.o: CFLAGS += -Wall
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
@@
-64,8
+66,11
@@
LDFLAGS += -lasound
endif
# gpu
endif
# gpu
-plugins/dfxvideo/%.o: CFLAGS += -Wall
+# note: code is not safe for strict-aliasing? (Castlevania problems)
+plugins/dfxvideo/%.o: CFLAGS += -Wall -fno-strict-aliasing
OBJS += plugins/dfxvideo/gpu.o
OBJS += plugins/dfxvideo/gpu.o
+plugins/dfxvideo/gpu.o: plugins/dfxvideo/fps.c plugins/dfxvideo/prim.c \
+ plugins/dfxvideo/gpu.c plugins/dfxvideo/soft.c
ifdef X11
LDFLAGS += -lX11 -lXv
OBJS += plugins/dfxvideo/draw.o
ifdef X11
LDFLAGS += -lX11 -lXv
OBJS += plugins/dfxvideo/draw.o
@@
-82,7
+87,7
@@
plugins/dfinput/%.o: CFLAGS += -Wall
OBJS += plugins/dfinput/pad.o
# gui
OBJS += plugins/dfinput/pad.o
# gui
-OBJS += frontend/main.o frontend/plugin.o
+OBJS += frontend/main.o frontend/plugin.o
ifeq "$(USE_GTK)" "1"
OBJS += maemo/hildon.o maemo/main.o
maemo/%.o: maemo/%.c
ifeq "$(USE_GTK)" "1"
OBJS += maemo/hildon.o maemo/main.o
maemo/%.o: maemo/%.c
@@
-143,7
+148,7
@@
VER ?= $(shell git describe master)
rel: pcsx $(PLUGINS) \
pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
rel: pcsx $(PLUGINS) \
pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
- pandora/picorestore pandora/readme.txt skin COPYING
+ pandora/picorestore pandora/readme.txt
pandora/
skin COPYING
rm -rf out
mkdir -p out/plugins
cp -r $^ out/
rm -rf out
mkdir -p out/plugins
cp -r $^ out/