Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add SoundFX Macs Opera CMF support
  • Loading branch information
Sebastian Kienzl committed Jan 8, 2017
1 parent 99e6e9f commit 0c9e68a
Show file tree
Hide file tree
Showing 8 changed files with 19,760 additions and 2 deletions.
2 changes: 2 additions & 0 deletions contrib/vs2015/adplug/adplug.vcxproj
Expand Up @@ -82,6 +82,7 @@
<ClCompile Include="..\..\..\src\xsm.cpp" />
<ClCompile Include="..\..\..\src\nemuopl.cpp" />
<ClCompile Include="..\..\..\src\nukedopl.c" />
<ClCompile Include="..\..\..\src\cmfmcsop.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\a2m.h" />
Expand Down Expand Up @@ -152,6 +153,7 @@
<ClInclude Include="..\..\..\src\xsm.h" />
<ClInclude Include="..\..\..\src\nemuopl.h" />
<ClInclude Include="..\..\..\src\nukedopl.h" />
<ClInclude Include="..\..\..\src\cmfmcsop.h" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Expand Up @@ -7,7 +7,7 @@ hsp.cpp ksm.cpp mad.cpp mid.cpp mkj.cpp cff.cpp dmo.cpp s3m.cpp dtm.cpp \
fmc.cpp mtk.cpp rad.cpp raw.cpp sa2.cpp xad.cpp flash.cpp bmf.cpp hybrid.cpp \
hyp.cpp psi.cpp rat.cpp u6m.cpp rol.cpp mididata.h xsm.cpp adlibemu.c dro.cpp \
lds.cpp realopl.cpp analopl.cpp temuopl.cpp msc.cpp rix.cpp adl.cpp jbm.cpp \
cmf.cpp surroundopl.cpp dro2.cpp got.cpp woodyopl.cpp nemuopl.cpp nukedopl.c \
cmf.cpp surroundopl.cpp dro2.cpp got.cpp cmfmcsop.cpp woodyopl.cpp nemuopl.cpp nukedopl.c \
adlib.cpp mus.cpp mdi.cpp

libadplug_la_LDFLAGS = -release @VERSION@ -version-info 0 $(libbinio_LIBS)
Expand All @@ -25,5 +25,5 @@ mtk.h protrack.h rad.h raw.h s3m.h sa2.h sng.h u6m.h player.h fmc.h mad.h \
xad.h bmf.h flash.h hyp.h psi.h rat.h hybrid.h rol.h adtrack.h cff.h dtm.h \
dmo.h fprovide.h database.h players.h xsm.h adlibemu.h kemuopl.h dro.h \
realopl.h analopl.h temuopl.h msc.h rix.h adl.h jbm.h cmf.h surroundopl.h \
dro2.h got.h version.h wemuopl.h woodyopl.h nemuopl.h nukedopl.h adlib.h \
dro2.h got.h cmfmcsop.h version.h wemuopl.h woodyopl.h nemuopl.h nukedopl.h adlib.h \
mus.h mdi.h
2 changes: 2 additions & 0 deletions src/adplug.cpp
Expand Up @@ -72,6 +72,7 @@
#include "got.h"
#include "mus.h"
#include "mdi.h"
#include "cmfmcsop.h"

/***** CAdPlug *****/

Expand Down Expand Up @@ -120,6 +121,7 @@ const CPlayerDesc CAdPlug::allplayers[] = {
CPlayerDesc(CadlPlayer::factory, "Westwood ADL", ".adl\0"),
CPlayerDesc(CjbmPlayer::factory, "JBM Adlib Music", ".jbm\0"),
CPlayerDesc(CgotPlayer::factory, "God of Thunder Music", ".got\0"),
CPlayerDesc(CcmfmacsoperaPlayer::factory, "SoundFX Macs Opera CMF", ".cmf\0"),
CPlayerDesc()
};

Expand Down

0 comments on commit 0c9e68a

Please sign in to comment.