diff options
| author | tron <tron@openttd.org> | 2005-07-26 06:59:48 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-07-26 06:59:48 +0000 |
| commit | ed2e3c77afc8baf0d9ff19c857173e37275aed92 (patch) | |
| tree | d424304b5947a62092a374dd4d96c1bacc11f0b7 /Makefile | |
| parent | 09204dcf44ce2b4a494f36e78bd77c1c46ef7d2a (diff) | |
| download | openttd-ed2e3c77afc8baf0d9ff19c857173e37275aed92.tar.xz | |
(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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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) |