commit 3cf74a97261b1a0aceb591b495b0857781918edd
Merge: 299e1c5a 892ad7c0
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Nov 21 01:16:14 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Nov 21 01:16:14 2009 +0000
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1734
Makefile.am | 1 +
configure.in | 3 +-
msvc/ChocolateDoom.vcproj | 40 ++++++++
pkg/Makefile.am | 3 +
pkg/wince/{Makefile.am => GNUmakefile.am} | 2 +
setup/Makefile.am | 3 +-
setup/configfile.c | 28 +++++-
setup/execute.c | 123 ++++++++++++++----------
setup/mainmenu.c | 1 +
setup/sound.c | 18 +---
setup/sound.h | 14 +++
src/i_sdlmusic.c | 32 ++++---
src/i_video.c | 24 ++++-
src/m_config.c | 28 +++++-
src/m_misc.c | 8 ++
src/m_misc.h | 1 +
src/p_doors.c | 37 +++++++-
src/p_map.c | 3 +-
src/p_spec.c | 150 +++++++++++++++++++++++++++---
src/s_sound.c | 10 +-
textscreen/txt_sdl.c | 41 +++++++-
21 files changed, 457 insertions(+), 113 deletions(-)
diff --cc Makefile.am
index 01c3c2e2,dc3a40d0..5de8d88c
--- a/Makefile.am
+++ b/Makefile.am
@@@ -45,7 -44,8 +45,8 @@@ EXTRA_DIST
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
docdir=$(prefix)/share/doc/@PACKAGE@
-SUBDIRS=wince textscreen pcsound src man setup
+SUBDIRS=wince textscreen opl pcsound src man setup
+ DIST_SUBDIRS=pkg $(SUBDIRS)
if HAVE_PYTHON
diff --cc configure.in
index 1d1b3f3e,f4a3f507..0327c0c3
--- a/configure.in
+++ b/configure.in
@@@ -125,11 -119,10 +125,12 @@@ textscreen/Makefil
textscreen/examples/Makefile
setup/Makefile
man/Makefile
+opl/Makefile
+opl/examples/Makefile
src/Makefile
pcsound/Makefile
- pkg/wince/Makefile
+ pkg/Makefile
+ pkg/wince/GNUmakefile
src/resource.rc
src/doom-screensaver.desktop
setup/setup-res.rc
diff --cc setup/sound.c
index 92a6cbae,9e02aeec..0ca95b08
--- a/setup/sound.c
+++ b/setup/sound.c
@@@ -64,15 -42,6 +50,13 @@@ static char *sfxmode_strings[]
"Digital",
};
+static char *musmode_strings[] =
+{
+ "Disabled",
+ "OPL (Adlib/SB)",
+ "Native MIDI"
+};
+
- #define DEFAULT_MUSIC_DEVICE SNDDEVICE_SB
-
int snd_sfxdevice = SNDDEVICE_SB;
int numChannels = 8;
int sfxVolume = 15;