notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
afc74f4
)
support sdl audio
author
notaz
<notasas@gmail.com>
Sun, 29 Jul 2012 21:37:24 +0000
(
00:37
+0300)
committer
notaz
<notasas@gmail.com>
Sun, 29 Jul 2012 21:37:24 +0000
(
00:37
+0300)
Makefile
patch
|
blob
|
blame
|
history
configure
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index
8c2628c
..
5720bab
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-79,6
+79,9
@@
plugins/dfsound/%.o: CFLAGS += -DUSEALSA
OBJS += plugins/dfsound/alsa.o
LDLIBS += -lasound
endif
OBJS += plugins/dfsound/alsa.o
LDLIBS += -lasound
endif
+ifeq "$(SOUND_DRIVER)" "sdl"
+OBJS += plugins/dfsound/sdl.o
+endif
ifeq "$(SOUND_DRIVER)" "none"
OBJS += plugins/dfsound/nullsnd.o
endif
ifeq "$(SOUND_DRIVER)" "none"
OBJS += plugins/dfsound/nullsnd.o
endif
diff --git
a/configure
b/configure
index
8c40b7d
..
babf444
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-28,7
+28,7
@@
platform_list="generic pandora maemo caanoo libretro"
platform="generic"
builtin_gpu_list="peops unai neon"
builtin_gpu=""
platform="generic"
builtin_gpu_list="peops unai neon"
builtin_gpu=""
-sound_driver_list="oss alsa libretro none"
+sound_driver_list="oss alsa
sdl
libretro none"
sound_driver="alsa"
plugins="plugins/spunull/spunull.so \
plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so"
sound_driver="alsa"
plugins="plugins/spunull/spunull.so \
plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so"
@@
-138,7
+138,7
@@
if [ "x$builtin_gpu" != "x" ]; then
fi
case "$sound_driver" in
fi
case "$sound_driver" in
-oss|alsa|libretro|none)
+oss|alsa|
sdl|
libretro|none)
;;
*)
echo "unsupported sound driver: $sound_driver"
;;
*)
echo "unsupported sound driver: $sound_driver"