(svn r2712) Overhaul DirectMusic MIDI backend:

- Merge the .c and .cpp part into one file
- Properly deinitialize at the end
- Remove "experimental" status
- Miscellaneous smaller changes
-Fix: Volume control works now
This commit is contained in:
tron
2005-07-26 06:59:48 +00:00
parent 68bd17e351
commit 81be08bc21
5 changed files with 229 additions and 437 deletions

View File

@@ -66,6 +66,7 @@
# MIDI: if set, it will use it as custom path to midi player.
# If unset, it will use the hardcoded path in the c code
# This can still be overriden by the music.extmidi openttd.cfg option.
# WITH_DIRECTMUSIC: enable DirectMusic MIDI support
# WITH_NETWORK: enable networking
# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
#
@@ -118,9 +119,6 @@
# CC_HOST: the gcc of your localhost if you are making a target that produces incompatible executables
# CFLAGS_HOST: cflags used for CC_HOST. Make it something if you are getting errors when you try to compi
# windows executables on linux. (just: CFLAGS_HOST:='-I' or something)
#
# Experimental (does not work properly):
# WITH_DIRECTMUSIC: enable DirectMusic MIDI support
##############################################################################
@@ -751,8 +749,7 @@ OBJS += winres.o
endif
ifdef WITH_DIRECTMUSIC
C_SOURCES += music/dmusic.c
CXX_SOURCES += music/dmusic2.cpp
CXX_SOURCES += music/dmusic.cpp
endif
DEPS = $(OBJS:%.o=.deps/%.d)