From 997d2ee86ef77422ce7ddd08859bd5a4aef66145 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 4 Mar 2009 22:07:27 +0000
Subject: Add initial stub for OPL backend.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1447
---
 src/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 63ddc98f..66909dd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -155,6 +155,7 @@ FEATURE_SOUND_SOURCE_FILES =               \
 i_pcsound.c                                \
 i_sdlsound.c                               \
 i_sdlmusic.c                               \
+i_oplmusic.c                               \
 mus2mid.c            mus2mid.h
 
 SOURCE_FILES = $(MAIN_SOURCE_FILES)                \
@@ -172,6 +173,7 @@ endif
 chocolate_doom_LDADD =                               \
                        ../textscreen/libtextscreen.a \
                        ../pcsound/libpcsound.a       \
+                       ../opl/libopl.a               \
                        @LDFLAGS@                     \
                        @SDLMIXER_LIBS@               \
                        @SDLNET_LIBS@
-- 
cgit v1.2.3


From 3efee3d5e2b662df97aabc4c8fd275b60b6f08f4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 10 Mar 2009 00:03:54 +0000
Subject: Add initial GENMIDI lump loading, OPL detection.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1456
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 66909dd1..406d0af8 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                              \
-- 
cgit v1.2.3


From b96cdbe82fa6cb51ac91072ad86e084d739fd9be Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 28 Mar 2009 00:24:50 +0000
Subject: Initial MIDI file parsing code.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1489
---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 406d0af8..92095b5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -156,6 +156,7 @@ 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)                \
-- 
cgit v1.2.3


From 9b192c44f932542ccd835936d593c43ce3e9e9e3 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 3 Apr 2009 19:58:08 +0000
Subject: Fix up MIDI reading code; add test code.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1494
---
 src/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 92095b5c..3874c35f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,3 +195,6 @@ icon.c : ../data/doom.ico
 
 endif
 
+midiread : midifile.c
+	$(CC) -DTEST $(CFLAGS) @LDFLAGS@ $^ -o $@
+
-- 
cgit v1.2.3