diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-09 20:00:17 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-09 20:00:17 +0100 |
| commit | a9f0a9a19396165633ff3dd96141dc731f99bc86 (patch) | |
| tree | cb783b71f6c679f89f844a2a4f35a5e94198fb56 /plugins/adplug | |
| parent | 5868217da60b338408122707911602078410f2f6 (diff) | |
rolled back adplug to use old CMF loader
Diffstat (limited to 'plugins/adplug')
| -rw-r--r-- | plugins/adplug/Makefile.am | 5 | ||||
| -rw-r--r-- | plugins/adplug/adplug/adplug.cpp | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/plugins/adplug/Makefile.am b/plugins/adplug/Makefile.am index 791c04a2..f1ae0d52 100644 --- a/plugins/adplug/Makefile.am +++ b/plugins/adplug/Makefile.am @@ -5,7 +5,8 @@ pkglib_LTLIBRARIES = adplug.la AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio +#AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -O0 +AM_CPPFLAGS = -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -O0 adplug_la_SOURCES = adplug-db.cpp\ plugin.c\ @@ -37,8 +38,6 @@ adplug_la_SOURCES = adplug-db.cpp\ adplug/bmf.h\ adplug/cff.cpp\ adplug/cff.h\ - adplug/cmf.cpp\ - adplug/cmf.h\ adplug/d00.cpp\ adplug/d00.h\ adplug/database.cpp\ diff --git a/plugins/adplug/adplug/adplug.cpp b/plugins/adplug/adplug/adplug.cpp index d02bb047..f4b8e729 100644 --- a/plugins/adplug/adplug/adplug.cpp +++ b/plugins/adplug/adplug/adplug.cpp @@ -35,7 +35,7 @@ #include "sng.h" #include "adtrack.h" #include "bam.h" -#include "cmf.h" +//#include "cmf.h" #include "d00.h" #include "dfm.h" #include "hsp.h" @@ -80,13 +80,13 @@ const CPlayerDesc CAdPlug::allplayers[] = { CPlayerDesc(CadtrackLoader::factory, "Adlib Tracker", ".sng\0"), CPlayerDesc(CamdLoader::factory, "AMUSIC", ".amd\0"), CPlayerDesc(CbamPlayer::factory, "Bob's Adlib Music", ".bam\0"), - CPlayerDesc(CcmfPlayer::factory, "Creative Music File", ".cmf\0"), +// CPlayerDesc(CcmfPlayer::factory, "Creative Music File", ".cmf\0"), CPlayerDesc(Cd00Player::factory, "Packed EdLib", ".d00\0"), CPlayerDesc(CdfmLoader::factory, "Digital-FM", ".dfm\0"), CPlayerDesc(ChspLoader::factory, "HSC Packed", ".hsp\0"), CPlayerDesc(CksmPlayer::factory, "Ken Silverman Music", ".ksm\0"), CPlayerDesc(CmadLoader::factory, "Mlat Adlib Tracker", ".mad\0"), - CPlayerDesc(CmidPlayer::factory, "MIDI", ".mid\0.sci\0.laa\0"), + CPlayerDesc(CmidPlayer::factory, "MIDI", ".mid\0.sci\0.laa\0.cmf\0"), CPlayerDesc(CmkjPlayer::factory, "MKJamz", ".mkj\0"), CPlayerDesc(CcffLoader::factory, "Boomtracker", ".cff\0"), CPlayerDesc(CdmoLoader::factory, "TwinTeam", ".dmo\0"), |