diff options
| author | Eugene Sandulenko | 2005-05-14 23:28:22 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-05-14 23:28:22 +0000 |
| commit | 80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd (patch) | |
| tree | 61a692342f0c6762919d3701811438d77991c5f7 /scumm/scumm.cpp | |
| parent | 3588b96d4fc6c1100a01f21987f34dab9c0e97bf (diff) | |
| download | scummvm-rg350-80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd.tar.gz scummvm-rg350-80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd.tar.bz2 scummvm-rg350-80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd.zip | |
Improvements to --disable-* stuff. Now less ugly #ifdefs with #includes.
svn-id: r18100
Diffstat (limited to 'scumm/scumm.cpp')
| -rw-r--r-- | scumm/scumm.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 0fbd069c3a..1c31f14177 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -34,32 +34,26 @@ #include "gui/message.h" #include "gui/newgui.h" +#include "scumm/akos.h" #include "scumm/charset.h" #include "scumm/costume.h" #include "scumm/debugger.h" #include "scumm/dialogs.h" #include "scumm/imuse.h" +#include "scumm/imuse_digi/dimuse.h" +#include "scumm/insane/insane.h" #include "scumm/intern.h" +#include "scumm/logic_he.h" #include "scumm/player_nes.h" #include "scumm/player_v1.h" #include "scumm/player_v2.h" #include "scumm/player_v2a.h" #include "scumm/player_v3a.h" +#include "scumm/resource_v7he.h" #include "scumm/sound.h" #include "scumm/scumm.h" #include "scumm/util.h" -#ifndef DISABLE_HE -#include "scumm/logic_he.h" -#include "scumm/resource_v7he.h" -#endif - -#ifndef DISABLE_SCUMM_7_8 -#include "scumm/akos.h" -#include "scumm/imuse_digi/dimuse.h" -#include "scumm/insane/insane.h" -#endif - #ifdef __PALM_OS__ #include "extras/palm-scumm-md5.h" #else |