diff options
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r-- | scumm/imuse_digi/dimuse.cpp | 4 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_music.cpp | 4 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_tables.cpp | 8 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_track.cpp | 4 |
4 files changed, 18 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index f6f2d71070..eaa89c1790 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -18,6 +18,8 @@ * $Header$ */ +#ifndef DISABLE_SCUMM_7_8 + #include "common/stdafx.h" #include "common/system.h" #include "common/timer.h" @@ -409,3 +411,5 @@ void IMuseDigital::switchToNextRegion(Track *track) { } } // End of namespace Scumm + +#endif diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index e755c4f829..00a11a9684 100644 --- a/scumm/imuse_digi/dimuse_music.cpp +++ b/scumm/imuse_digi/dimuse_music.cpp @@ -18,6 +18,8 @@ * $Header$ */ +#ifndef DISABLE_SCUMM_7_8 + #include "common/stdafx.h" #include "common/scummsys.h" #include "scumm/scumm.h" @@ -441,3 +443,5 @@ void IMuseDigital::playFtMusic(const char *songName, int opcode, int volume) { } // End of namespace Scumm + +#endif diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp index 7c5527431d..e2409a61f8 100644 --- a/scumm/imuse_digi/dimuse_tables.cpp +++ b/scumm/imuse_digi/dimuse_tables.cpp @@ -18,12 +18,14 @@ * $Header$ */ +#ifndef DISABLE_SCUMM_7_8 + #include "common/stdafx.h" #include "scumm/imuse_digi/dimuse.h" namespace Scumm { -#ifdef __PALM_OS__ +#ifdef PALMOS_68K const imuseRoomMap *_digStateMusicMap; const imuseDigTable *_digStateMusicTable; const imuseDigTable *_digSeqMusicTable; @@ -852,7 +854,7 @@ const imuseFtSeqTable _ftSeqMusicTable[] = { } // End of namespace Scumm -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "scumm_globals.h" _GINIT(DimuseTables) @@ -878,3 +880,5 @@ _GRELEASEPTR(GBVARS_FTSEQNAMES_INDEX , GBVARS_SCUMM) _GEND #endif + +#endif diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index f0fda62f8a..f4e99ee3e4 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -18,6 +18,8 @@ * $Header$ */ +#ifndef DISABLE_SCUMM_7_8 + #include "common/stdafx.h" #include "common/timer.h" @@ -360,3 +362,5 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDel } } // End of namespace Scumm + +#endif |