diff options
| author | Simon Howard | 2010-03-08 01:14:23 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-03-08 01:14:23 +0000 |
| commit | 448adb31d703afed9e9cc2bfd109c1fcd34447c4 (patch) | |
| tree | ca987d9f677ec93263840477bc1eebc9a01fecab /src/Makefile.am | |
| parent | c4fe7aa8b6962edf79e0ccec469970618a92b0ef (diff) | |
| parent | b9e18229624500d6d2a6112a5c00882d7b7051de (diff) | |
| download | chocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.tar.gz chocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.tar.bz2 chocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.zip | |
Merge opl-branch to trunk.
OPL support still isn't perfect, and it certainly isn't complete.
However, for now, it's good enough.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1878
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 378ad053..8b827131 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ gamesdir = $(prefix)/games games_PROGRAMS = chocolate-doom chocolate-server -AM_CFLAGS = -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ +AM_CFLAGS = -I../opl -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ DEDSERV_FILES=\ d_dedicated.c \ @@ -155,6 +155,8 @@ FEATURE_SOUND_SOURCE_FILES = \ i_pcsound.c \ i_sdlsound.c \ i_sdlmusic.c \ +i_oplmusic.c \ +midifile.c midifile.h \ mus2mid.c mus2mid.h SOURCE_FILES = $(MAIN_SOURCE_FILES) \ @@ -173,6 +175,7 @@ chocolate_doom_LDADD = \ ../wince/libc_wince.a \ ../textscreen/libtextscreen.a \ ../pcsound/libpcsound.a \ + ../opl/libopl.a \ @LDFLAGS@ \ @SDLMIXER_LIBS@ \ @SDLNET_LIBS@ @@ -193,3 +196,6 @@ icon.c : ../data/doom8.ico endif +midiread : midifile.c + $(CC) -DTEST $(CFLAGS) @LDFLAGS@ $^ -o $@ + |