diff options
303 files changed, 315 insertions, 315 deletions
diff --git a/backends/PalmOS/Src/cd_default.cpp b/backends/PalmOS/Src/cd_default.cpp index ed12204055..233f27687b 100644 --- a/backends/PalmOS/Src/cd_default.cpp +++ b/backends/PalmOS/Src/cd_default.cpp @@ -19,7 +19,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "cd_default.h" diff --git a/backends/PalmOS/Src/cd_msa.cpp b/backends/PalmOS/Src/cd_msa.cpp index be99d97169..a5eeacb507 100644 --- a/backends/PalmOS/Src/cd_msa.cpp +++ b/backends/PalmOS/Src/cd_msa.cpp @@ -20,7 +20,7 @@ * */ #include <SonyClie.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "cd_msa.h" #include "start.h" // for appFileCreat diff --git a/backends/PalmOS/Src/cd_pockettunes.cpp b/backends/PalmOS/Src/cd_pockettunes.cpp index b97802ca61..de620275f2 100644 --- a/backends/PalmOS/Src/cd_pockettunes.cpp +++ b/backends/PalmOS/Src/cd_pockettunes.cpp @@ -19,7 +19,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/backends/PalmOS/Src/forms/formmain.cpp b/backends/PalmOS/Src/forms/formmain.cpp index d4a62e8e9a..cb8d875eb3 100644 --- a/backends/PalmOS/Src/forms/formmain.cpp +++ b/backends/PalmOS/Src/forms/formmain.cpp @@ -7,7 +7,7 @@ #include "scumm_globals.h" #include "globals.h" -#include "stdafx.h" +#include "common/stdafx.h" #include "version.h" #include "formEditGame.h" diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp index b4009f5882..0f32ae9e2b 100644 --- a/backends/PalmOS/Src/palm.cpp +++ b/backends/PalmOS/Src/palm.cpp @@ -19,7 +19,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" #include "scumm.h" diff --git a/backends/PalmOS/Src/palmevt.cpp b/backends/PalmOS/Src/palmevt.cpp index d15eedb2c3..c4539d2b35 100644 --- a/backends/PalmOS/Src/palmevt.cpp +++ b/backends/PalmOS/Src/palmevt.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" #include "common/scaler.h" diff --git a/backends/PalmOS/Src/palmgfx.cpp b/backends/PalmOS/Src/palmgfx.cpp index 594d6645a7..5248a2838a 100644 --- a/backends/PalmOS/Src/palmgfx.cpp +++ b/backends/PalmOS/Src/palmgfx.cpp @@ -19,7 +19,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" #include "common/scaler.h" diff --git a/backends/PalmOS/Src/palmmos.cpp b/backends/PalmOS/Src/palmmos.cpp index 75a28bdf41..69400b59b2 100644 --- a/backends/PalmOS/Src/palmmos.cpp +++ b/backends/PalmOS/Src/palmmos.cpp @@ -19,7 +19,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" diff --git a/backends/PalmOS/Src/palmovl.cpp b/backends/PalmOS/Src/palmovl.cpp index 7d458c02cd..80babec563 100644 --- a/backends/PalmOS/Src/palmovl.cpp +++ b/backends/PalmOS/Src/palmovl.cpp @@ -19,7 +19,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" void OSystem_PALMOS::showOverlay() { diff --git a/backends/PalmOS/Src/palmrdr.cpp b/backends/PalmOS/Src/palmrdr.cpp index 42f8ccf354..fcebafb9f0 100644 --- a/backends/PalmOS/Src/palmrdr.cpp +++ b/backends/PalmOS/Src/palmrdr.cpp @@ -19,7 +19,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" #include "rumble.h" diff --git a/backends/PalmOS/Src/palmsave.cpp b/backends/PalmOS/Src/palmsave.cpp index a13a112e0f..9c0ef08b79 100644 --- a/backends/PalmOS/Src/palmsave.cpp +++ b/backends/PalmOS/Src/palmsave.cpp @@ -21,7 +21,7 @@ */ #include <ctype.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" #define MAX_BLOCK 64000 // store in memory, before dump to file diff --git a/backends/PalmOS/Src/palmsnd.cpp b/backends/PalmOS/Src/palmsnd.cpp index a6bf8090e1..40ab498e8a 100644 --- a/backends/PalmOS/Src/palmsnd.cpp +++ b/backends/PalmOS/Src/palmsnd.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "palm.h" diff --git a/backends/PalmOS/Src/snd_stream.cpp b/backends/PalmOS/Src/snd_stream.cpp index 43e9333e8f..c2776ab029 100644 --- a/backends/PalmOS/Src/snd_stream.cpp +++ b/backends/PalmOS/Src/snd_stream.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "common/stdafx.h" #include "palm.h" Err sndCallback(void* UserDataP, SndStreamRef stream, void* bufferP, UInt32 *bufferSizeP) { diff --git a/backends/fs/fs.cpp b/backends/fs/fs.cpp index 8b847a05d0..39a3528353 100644 --- a/backends/fs/fs.cpp +++ b/backends/fs/fs.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/fs/fs.h" #include "common/util.h" diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp index 5ef8dc80e7..96be354afc 100644 --- a/backends/fs/palmos/palmos-fs.cpp +++ b/backends/fs/palmos/palmos-fs.cpp @@ -20,7 +20,7 @@ #if defined(__PALMOS_TRAPS__) -#include "stdafx.h" +#include "common/stdafx.h" #include "../fs.h" #include <stdio.h> #include <stdlib.h> diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index eb72389d26..0224eb67a2 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -20,7 +20,7 @@ #if defined(UNIX) || defined(__DC__) -#include "stdafx.h" +#include "common/stdafx.h" #include "../fs.h" diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index 8a0f3b3a2a..ef9ad4a5d8 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -22,7 +22,7 @@ */ #if defined (__SYMBIAN32__) -#include "stdafx.h" +#include "common/stdafx.h" #include "../fs.h" //#include <sys/param.h> diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index 4ddece6b3a..2de92b83f1 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -20,7 +20,7 @@ #ifdef WIN32 -#include "stdafx.h" +#include "common/stdafx.h" #include "../fs.h" #include <stdio.h> #include <stdlib.h> diff --git a/backends/gp32/gp-fs.cpp b/backends/gp32/gp-fs.cpp index f752282ff5..fa204c1973 100644 --- a/backends/gp32/gp-fs.cpp +++ b/backends/gp32/gp-fs.cpp @@ -24,7 +24,7 @@ #if defined (__GP32__) -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/gp32/gp32.h" #include "backends/fs/fs.h" diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index 77a14f4a70..81d264965f 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -27,7 +27,7 @@ #include "sound/mpu401.h" -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "common/config-manager.h" diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index b32fee88c1..8ed208575d 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -20,7 +20,7 @@ #ifdef MACOSX -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/util.h" #include "sound/mpu401.h" diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp index efd8d5a1d1..74567cae03 100644 --- a/backends/midi/morphos.cpp +++ b/backends/midi/morphos.cpp @@ -29,7 +29,7 @@ #include <proto/dos.h> #include <proto/etude.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" #include "morphos.h" diff --git a/backends/midi/null.cpp b/backends/midi/null.cpp index 7d785ebb17..d7cfc3d4e8 100644 --- a/backends/midi/null.cpp +++ b/backends/midi/null.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/mpu401.h" /* NULL driver */ diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 46917f5a46..3999ebc91f 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -27,7 +27,7 @@ #if defined(UNIX) && !defined(__BEOS__) -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index dd21fffa10..482a9ee70f 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -20,7 +20,7 @@ #if defined(WIN32) && !defined(_WIN32_WCE) -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp index e3ef2cab15..10d353997d 100644 --- a/backends/midi/ypa1.cpp +++ b/backends/midi/ypa1.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index 8591e852f6..8fb4304dc1 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp index 987e43178e..72dc4ce7a1 100644 --- a/backends/morphos/morphos.cpp +++ b/backends/morphos/morphos.cpp @@ -21,7 +21,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "engine.h" #include "common/util.h" #include "scumm/scumm.h" diff --git a/backends/morphos/morphos_scaler.cpp b/backends/morphos/morphos_scaler.cpp index 16db97cdb8..d713978caf 100644 --- a/backends/morphos/morphos_scaler.cpp +++ b/backends/morphos/morphos_scaler.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "engine.h" #include <exec/types.h> diff --git a/backends/morphos/morphos_sound.cpp b/backends/morphos/morphos_sound.cpp index 70b344389d..363b83e9d4 100644 --- a/backends/morphos/morphos_sound.cpp +++ b/backends/morphos/morphos_sound.cpp @@ -21,7 +21,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "engine.h" #include <dos/dos.h> diff --git a/backends/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp index 1227506976..2c25e0e61a 100644 --- a/backends/morphos/morphos_start.cpp +++ b/backends/morphos/morphos_start.cpp @@ -33,7 +33,7 @@ #include <proto/cdda.h> #include <proto/icon.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "base/gameDetector.h" #include "common/scaler.h" diff --git a/backends/morphos/morphos_timer.cpp b/backends/morphos/morphos_timer.cpp index 51977f0dd7..d129b0c274 100644 --- a/backends/morphos/morphos_timer.cpp +++ b/backends/morphos/morphos_timer.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "engine.h" #include <exec/memory.h> diff --git a/backends/null/null.cpp b/backends/null/null.cpp index a85c83d8be..bed51cd68f 100644 --- a/backends/null/null.cpp +++ b/backends/null/null.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/ps2/fileio.h b/backends/ps2/fileio.h index fc10ad8bd8..48c9c7df5d 100644 --- a/backends/ps2/fileio.h +++ b/backends/ps2/fileio.h @@ -22,7 +22,7 @@ #ifndef __PS2FILE_IO__ #define __PS2FILE_IO__ -#include "scummsys.h" +#include "common/scummsys.h" class Ps2File { public: diff --git a/backends/ps2/savefile.cpp b/backends/ps2/savefile.cpp index 05539c5ab1..2e8276afb8 100644 --- a/backends/ps2/savefile.cpp +++ b/backends/ps2/savefile.cpp @@ -30,7 +30,7 @@ #include "backends/ps2/Gs2dScreen.h" #include "backends/ps2/asyncfio.h" #include "backends/ps2/systemps2.h" -#include "scummsys.h" +#include "common/scummsys.h" extern AsyncFio fio; diff --git a/backends/ps2/systemps2.cpp b/backends/ps2/systemps2.cpp index 33c93fb753..7bb95ec4c9 100644 --- a/backends/ps2/systemps2.cpp +++ b/backends/ps2/systemps2.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include <kernel.h> #include <stdio.h> #include <stdlib.h> @@ -31,7 +31,7 @@ #include <iopcontrol.h> #include <iopheap.h> #include <osd_config.h> -#include "scummsys.h" +#include "common/scummsys.h" #include "../intern.h" #include "base/engine.h" #include "backends/ps2/systemps2.h" diff --git a/backends/ps2/systemps2.h b/backends/ps2/systemps2.h index 01eb5c6f40..3c0a0efb9f 100644 --- a/backends/ps2/systemps2.h +++ b/backends/ps2/systemps2.h @@ -22,8 +22,8 @@ #ifndef SYSTEMPS2_H #define SYSTEMPS2_H -#include "stdafx.h" -#include "system.h" +#include "common/stdafx.h" +#include "common/system.h" class Gs2dScreen; class Ps2Input; diff --git a/backends/wince/CEActions.cpp b/backends/wince/CEActions.cpp index aeb4f2025f..97be4e902a 100644 --- a/backends/wince/CEActions.cpp +++ b/backends/wince/CEActions.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "CEActions.h" #include "CEActionsPocket.h" #include "CEActionsSmartphone.h" diff --git a/backends/wince/CEActionsPocket.cpp b/backends/wince/CEActionsPocket.cpp index 8ed93e341b..342a3baa28 100644 --- a/backends/wince/CEActionsPocket.cpp +++ b/backends/wince/CEActionsPocket.cpp @@ -20,7 +20,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "CEActionsPocket.h" #include "EventsBuffer.h" diff --git a/backends/wince/CEActionsSmartphone.cpp b/backends/wince/CEActionsSmartphone.cpp index 9ded7cc8ac..b732360f28 100644 --- a/backends/wince/CEActionsSmartphone.cpp +++ b/backends/wince/CEActionsSmartphone.cpp @@ -23,7 +23,7 @@ //#ifdef WIN32_PLATFORM_WFSP -#include "stdafx.h" +#include "common/stdafx.h" #include "CEActionsSmartphone.h" #include "EventsBuffer.h" diff --git a/backends/wince/CEDevice.cpp b/backends/wince/CEDevice.cpp index 3f7121ddfd..3461569e4c 100644 --- a/backends/wince/CEDevice.cpp +++ b/backends/wince/CEDevice.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "CEDevice.h" #include <SDL.h> diff --git a/backends/wince/CEKeysDialog.cpp b/backends/wince/CEKeysDialog.cpp index a4575b4e02..2a79d5afce 100644 --- a/backends/wince/CEKeysDialog.cpp +++ b/backends/wince/CEKeysDialog.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "CEKeysDialog.h" #include "CEActions.h" diff --git a/backends/wince/CELauncherDialog.cpp b/backends/wince/CELauncherDialog.cpp index afc6943f13..c1ac0f8534 100644 --- a/backends/wince/CELauncherDialog.cpp +++ b/backends/wince/CELauncherDialog.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "wince-sdl.h" diff --git a/backends/wince/CEScaler.cpp b/backends/wince/CEScaler.cpp index f0b8263e86..e07c7f8ad2 100644 --- a/backends/wince/CEScaler.cpp +++ b/backends/wince/CEScaler.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "CEScaler.h" int redblueMasks[] = { 0x7C1F, 0xF81F }; diff --git a/backends/wince/CEgui/GUIElement.cpp b/backends/wince/CEgui/GUIElement.cpp index 2e89d87003..b5732f4653 100644 --- a/backends/wince/CEgui/GUIElement.cpp +++ b/backends/wince/CEgui/GUIElement.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "Toolbar.h" #include "SDL_ImageResource.h" diff --git a/backends/wince/CEgui/ItemAction.cpp b/backends/wince/CEgui/ItemAction.cpp index cfe880988b..a801b9b820 100644 --- a/backends/wince/CEgui/ItemAction.cpp +++ b/backends/wince/CEgui/ItemAction.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "ItemAction.h" namespace CEGUI { diff --git a/backends/wince/CEgui/ItemSwitch.cpp b/backends/wince/CEgui/ItemSwitch.cpp index 454a3be49c..5f020e0914 100644 --- a/backends/wince/CEgui/ItemSwitch.cpp +++ b/backends/wince/CEgui/ItemSwitch.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "ItemSwitch.h" namespace CEGUI { diff --git a/backends/wince/CEgui/Panel.cpp b/backends/wince/CEgui/Panel.cpp index 5c236dee72..a76c202690 100644 --- a/backends/wince/CEgui/Panel.cpp +++ b/backends/wince/CEgui/Panel.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "Panel.h" namespace CEGUI { diff --git a/backends/wince/CEgui/PanelItem.cpp b/backends/wince/CEgui/PanelItem.cpp index 6e901d5864..6d0cd1c5aa 100644 --- a/backends/wince/CEgui/PanelItem.cpp +++ b/backends/wince/CEgui/PanelItem.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "PanelItem.h" namespace CEGUI { diff --git a/backends/wince/CEgui/PanelKeyboard.cpp b/backends/wince/CEgui/PanelKeyboard.cpp index 395785d5fc..a7c43f3c68 100644 --- a/backends/wince/CEgui/PanelKeyboard.cpp +++ b/backends/wince/CEgui/PanelKeyboard.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "PanelKeyboard.h" namespace CEGUI { diff --git a/backends/wince/CEgui/SDL_ImageResource.cpp b/backends/wince/CEgui/SDL_ImageResource.cpp index ff52931056..b42fb37f41 100644 --- a/backends/wince/CEgui/SDL_ImageResource.cpp +++ b/backends/wince/CEgui/SDL_ImageResource.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "SDL_ImageResource.h" namespace CEGUI { diff --git a/backends/wince/CEgui/Toolbar.cpp b/backends/wince/CEgui/Toolbar.cpp index 324439145b..e2829b1aa6 100644 --- a/backends/wince/CEgui/Toolbar.cpp +++ b/backends/wince/CEgui/Toolbar.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "Toolbar.h" namespace CEGUI { diff --git a/backends/wince/CEgui/ToolbarHandler.cpp b/backends/wince/CEgui/ToolbarHandler.cpp index e4496857d1..4f9d28c9ef 100644 --- a/backends/wince/CEgui/ToolbarHandler.cpp +++ b/backends/wince/CEgui/ToolbarHandler.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "ToolbarHandler.h" namespace CEGUI { diff --git a/backends/wince/CEkeys/EventsBuffer.cpp b/backends/wince/CEkeys/EventsBuffer.cpp index 70da6cd435..cad8e29f29 100644 --- a/backends/wince/CEkeys/EventsBuffer.cpp +++ b/backends/wince/CEkeys/EventsBuffer.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "EventsBuffer.h" namespace CEKEYS { diff --git a/backends/wince/CEkeys/Key.cpp b/backends/wince/CEkeys/Key.cpp index 1b28449b63..1cf9f0eaa2 100644 --- a/backends/wince/CEkeys/Key.cpp +++ b/backends/wince/CEkeys/Key.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "Key.h" namespace CEKEYS { diff --git a/base/engine.cpp b/base/engine.cpp index 9f091f5fd3..43e51b54e1 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #if defined(WIN32) #include <malloc.h> #endif diff --git a/base/engine.h b/base/engine.h index 4a0cc7aadb..9cdcfe4914 100644 --- a/base/engine.h +++ b/base/engine.h @@ -20,7 +20,7 @@ #ifndef ENGINE_H #define ENGINE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/str.h" diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 8e9bd2e660..f01926ad90 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "base/gameDetector.h" diff --git a/base/main.cpp b/base/main.cpp index 224681896d..e24c11cc77 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -28,7 +28,7 @@ * of almost all the classes, methods and variables, and how they interact. */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "base/gameDetector.h" #include "base/plugins.h" diff --git a/base/plugins.cpp b/base/plugins.cpp index 1dbcf4609f..6fc6accceb 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/fs/fs.h" #include "base/gameDetector.h" #include "base/plugins.h" diff --git a/common/config-file.cpp b/common/config-file.cpp index 5ce5ca4d8d..46e5a68672 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-file.h" #include "common/file.h" diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 0d11ec6dd3..5120f53230 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/file.h" diff --git a/common/debugger.cpp b/common/debugger.cpp index 360ce8489f..b4ec889171 100644 --- a/common/debugger.cpp +++ b/common/debugger.cpp @@ -18,7 +18,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/debugger.h" #include "common/system.h" diff --git a/common/file.h b/common/file.h index 9669158503..6c853812d7 100644 --- a/common/file.h +++ b/common/file.h @@ -22,7 +22,7 @@ #ifndef COMMON_FILE_H #define COMMON_FILE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/str.h" #include "common/stream.h" diff --git a/common/mutex.cpp b/common/mutex.cpp index a8a095618c..512dd67f76 100644 --- a/common/mutex.cpp +++ b/common/mutex.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/mutex.h" #include "common/system.h" diff --git a/common/savefile.cpp b/common/savefile.cpp index 72a855972c..b5013c84bc 100644 --- a/common/savefile.cpp +++ b/common/savefile.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "common/config-manager.h" #include "common/savefile.h" diff --git a/common/savefile.h b/common/savefile.h index 06f1a03f24..d1f0ef8f85 100644 --- a/common/savefile.h +++ b/common/savefile.h @@ -22,7 +22,7 @@ #ifndef COMMON_SAVEFILE_H #define COMMON_SAVEFILE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/stream.h" diff --git a/common/scaler/intern.h b/common/scaler/intern.h index bb20a43748..fd0ac33778 100644 --- a/common/scaler/intern.h +++ b/common/scaler/intern.h @@ -24,7 +24,7 @@ #ifndef COMMON_SCALER_INTERN_H #define COMMON_SCALER_INTERN_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" template<int bitFormat> diff --git a/common/scaler/thumbnail.cpp b/common/scaler/thumbnail.cpp index 6bca8e9f4a..bdbd5d0104 100644 --- a/common/scaler/thumbnail.cpp +++ b/common/scaler/thumbnail.cpp @@ -20,12 +20,12 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" -#include "scaler.h" -#include "scaler/intern.h" +#include "common/scaler.h" +#include "common/scaler/intern.h" template<int bitFormat> uint16 quadBlockInterpolate(const uint8* src, uint32 srcPitch) { diff --git a/common/str.cpp b/common/str.cpp index 231272e82a..429e64d88e 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/str.h" #include <ctype.h> diff --git a/common/stream.cpp b/common/stream.cpp index a9d5793be3..7c184b08b1 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/stream.h" #include "common/str.h" diff --git a/common/stream.h b/common/stream.h index c7890e5bdb..fc81b9aa0f 100644 --- a/common/stream.h +++ b/common/stream.h @@ -22,7 +22,7 @@ #ifndef COMMON_STREAM_H #define COMMON_STREAM_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" diff --git a/common/system.cpp b/common/system.cpp index 1a717f292b..0336a135a6 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/intern.h" diff --git a/common/timer.cpp b/common/timer.cpp index 6c298bde77..41cd1b34d9 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -20,7 +20,7 @@ #ifndef __MORPHOS__ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/timer.h" #include "common/util.h" diff --git a/common/util.cpp b/common/util.cpp index 831284d428..a4a4f0e715 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "common/util.h" diff --git a/gob/gob.cpp b/gob/gob.cpp index 92da0c5dac..b20042de78 100644 --- a/gob/gob.cpp +++ b/gob/gob.cpp @@ -18,7 +18,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/gameDetector.h" #include "base/plugins.h" diff --git a/gob/video.h b/gob/video.h index c9b00ae1b9..7297b6224a 100644 --- a/gob/video.h +++ b/gob/video.h @@ -22,7 +22,7 @@ #ifndef GOB_VIDEO_H #define GOB_VIDEO_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" namespace Gob { diff --git a/graphics/fontman.h b/graphics/fontman.h index dff104f4c6..3cbe5f2bf1 100644 --- a/graphics/fontman.h +++ b/graphics/fontman.h @@ -21,7 +21,7 @@ #ifndef FONTMAN_H #define FONTMAN_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/singleton.h" #include "common/str.h" diff --git a/graphics/scummfont.cpp b/graphics/scummfont.cpp index 314d20ea08..34de7bfcf8 100644 --- a/graphics/scummfont.cpp +++ b/graphics/scummfont.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "graphics/font.h" namespace Graphics { diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp index 91b85d3b06..3761536393 100644 --- a/gui/EditTextWidget.cpp +++ b/gui/EditTextWidget.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/EditTextWidget.h" #include "gui/dialog.h" #include "gui/newgui.h" diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp index 3104c65b27..f739f92ce1 100644 --- a/gui/ListWidget.cpp +++ b/gui/ListWidget.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/ListWidget.h" #include "gui/ScrollBarWidget.h" #include "gui/dialog.h" diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp index 7bf9af97bf..757a432245 100644 --- a/gui/PopUpWidget.cpp +++ b/gui/PopUpWidget.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "gui/dialog.h" #include "gui/newgui.h" diff --git a/gui/ScrollBarWidget.cpp b/gui/ScrollBarWidget.cpp index cb4131053a..dc8be4679c 100644 --- a/gui/ScrollBarWidget.cpp +++ b/gui/ScrollBarWidget.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "ScrollBarWidget.h" #include "gui/dialog.h" #include "gui/newgui.h" diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp index e0657af94a..681b2d6056 100644 --- a/gui/TabWidget.cpp +++ b/gui/TabWidget.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "gui/TabWidget.h" #include "gui/dialog.h" diff --git a/gui/about.cpp b/gui/about.cpp index 7de54fccf1..ce7567fddf 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "base/version.h" #include "common/system.h" diff --git a/gui/browser.cpp b/gui/browser.cpp index 18f13ecc30..728946202f 100644 --- a/gui/browser.cpp +++ b/gui/browser.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/browser.h" #include "gui/newgui.h" #include "gui/ListWidget.h" diff --git a/gui/chooser.cpp b/gui/chooser.cpp index e8004d89ce..826e075bf9 100644 --- a/gui/chooser.cpp +++ b/gui/chooser.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "gui/chooser.h" #include "gui/newgui.h" diff --git a/gui/console.cpp b/gui/console.cpp index 34dd303a31..eb0a812eae 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/console.h" #include "gui/ScrollBarWidget.h" diff --git a/gui/dialog.cpp b/gui/dialog.cpp index 915e34c128..00f5fc0a35 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -20,7 +20,7 @@ #include <ctype.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/newgui.h" #include "gui/dialog.h" #include "gui/widget.h" diff --git a/gui/editable.cpp b/gui/editable.cpp index cc55ee16f9..e5c981f0b6 100644 --- a/gui/editable.cpp +++ b/gui/editable.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/editable.h" #include "gui/newgui.h" diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 2a75620918..51ffa0d81b 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/fs/fs.h" diff --git a/gui/message.cpp b/gui/message.cpp index 233d86d22d..92afaec7b5 100644 --- a/gui/message.cpp +++ b/gui/message.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/str.h" #include "common/system.h" #include "gui/message.h" diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 5b8ab36ffc..2fa29759c2 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "common/util.h" #include "gui/newgui.h" diff --git a/gui/options.cpp b/gui/options.cpp index d8ab663098..c800e3921a 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/browser.h" #include "gui/chooser.h" #include "gui/newgui.h" diff --git a/gui/widget.cpp b/gui/widget.cpp index 1507cb6573..9e9513fa9e 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "graphics/fontman.h" #include "gui/widget.h" diff --git a/kyra/codecs.cpp b/kyra/codecs.cpp index 5fb8b7055e..930b2e0866 100644 --- a/kyra/codecs.cpp +++ b/kyra/codecs.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "codecs.h" /***************************************************************************** diff --git a/kyra/cpsimage.cpp b/kyra/cpsimage.cpp index 135f5ad27a..51f1d8332b 100644 --- a/kyra/cpsimage.cpp +++ b/kyra/cpsimage.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "resource.h" #include "codecs.h" diff --git a/kyra/font.cpp b/kyra/font.cpp index 999c9a4b0f..08c9282206 100644 --- a/kyra/font.cpp +++ b/kyra/font.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "resource.h" #include "common/stream.h" #include "common/array.h" diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index 051c1a9c59..685bc02cf2 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "base/gameDetector.h" diff --git a/kyra/palette.cpp b/kyra/palette.cpp index 63911f9268..4e1c4b7d72 100644 --- a/kyra/palette.cpp +++ b/kyra/palette.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "resource.h" #include "common/stream.h" diff --git a/kyra/resource.cpp b/kyra/resource.cpp index e93814a79f..1717114498 100644 --- a/kyra/resource.cpp +++ b/kyra/resource.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "resource.h" #include "wsamovie.h" diff --git a/kyra/script.cpp b/kyra/script.cpp index 9176f4a4f4..41436ec978 100644 --- a/kyra/script.cpp +++ b/kyra/script.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "kyra.h" #include "script.h" #include "resource.h" diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index 4ccc294b55..801463c60b 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "kyra.h" #include "script.h" diff --git a/kyra/wsamovie.cpp b/kyra/wsamovie.cpp index 1b585ba79e..ce70ea994c 100644 --- a/kyra/wsamovie.cpp +++ b/kyra/wsamovie.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "wsamovie.h" #include "codecs.h" diff --git a/queen/bankman.cpp b/queen/bankman.cpp index 5df13afed7..a5a89a7bc0 100644 --- a/queen/bankman.cpp +++ b/queen/bankman.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/bankman.h" #include "queen/resource.h" diff --git a/queen/command.cpp b/queen/command.cpp index 1d1837a556..80eca7f0a4 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/command.h" #include "queen/display.h" diff --git a/queen/credits.cpp b/queen/credits.cpp index 6c6948ba4f..2e486bc105 100644 --- a/queen/credits.cpp +++ b/queen/credits.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/credits.h" #include "queen/display.h" diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 4b21d878cc..142aab99dc 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/cutaway.h" #include "queen/bankman.h" diff --git a/queen/debug.cpp b/queen/debug.cpp index d01d941eda..dec53d9fef 100644 --- a/queen/debug.cpp +++ b/queen/debug.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/debug.h" #include "queen/defs.h" diff --git a/queen/display.cpp b/queen/display.cpp index 9b514ea175..c376f313d8 100644 --- a/queen/display.cpp +++ b/queen/display.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "queen/display.h" diff --git a/queen/graphics.cpp b/queen/graphics.cpp index d1d0cf3b53..0bd3825f2c 100644 --- a/queen/graphics.cpp +++ b/queen/graphics.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/graphics.h" #include "queen/bankman.h" diff --git a/queen/grid.cpp b/queen/grid.cpp index e3ffa1af1d..6036928ca3 100644 --- a/queen/grid.cpp +++ b/queen/grid.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/grid.h" #include "queen/display.h" diff --git a/queen/input.cpp b/queen/input.cpp index 597e85bf44..699fbaa080 100644 --- a/queen/input.cpp +++ b/queen/input.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" diff --git a/queen/journal.cpp b/queen/journal.cpp index f5a3f87616..98b73f6217 100644 --- a/queen/journal.cpp +++ b/queen/journal.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "queen/journal.h" diff --git a/queen/logic.cpp b/queen/logic.cpp index 01c6919aff..1e288a5858 100644 --- a/queen/logic.cpp +++ b/queen/logic.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/logic.h" #include "common/config-manager.h" diff --git a/queen/music.cpp b/queen/music.cpp index c601202218..57d85f48e0 100644 --- a/queen/music.cpp +++ b/queen/music.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/music.h" #include "queen/queen.h" #include "queen/resource.h" diff --git a/queen/musicdata.cpp b/queen/musicdata.cpp index 1a52455550..5e6637fbad 100644 --- a/queen/musicdata.cpp +++ b/queen/musicdata.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/sound.h" namespace Queen { diff --git a/queen/queen.cpp b/queen/queen.cpp index 07bdf58a0f..54b86fa17c 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/fs/fs.h" diff --git a/queen/resource.cpp b/queen/resource.cpp index 75292bca96..02ceab58a3 100644 --- a/queen/resource.cpp +++ b/queen/resource.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/resource.h" namespace Queen { diff --git a/queen/sound.cpp b/queen/sound.cpp index 3181d15843..0a058d57d0 100644 --- a/queen/sound.cpp +++ b/queen/sound.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/sound.h" #include "queen/input.h" diff --git a/queen/state.cpp b/queen/state.cpp index 408dce033e..46f496248d 100644 --- a/queen/state.cpp +++ b/queen/state.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/state.h" namespace Queen { diff --git a/queen/talk.cpp b/queen/talk.cpp index c2976ffb5c..3a0c47670d 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/talk.h" #include "queen/bankman.h" diff --git a/queen/walk.cpp b/queen/walk.cpp index 8a0592fe39..9a4b907bce 100644 --- a/queen/walk.cpp +++ b/queen/walk.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "queen/walk.h" #include "queen/bankman.h" diff --git a/saga/saga.cpp b/saga/saga.cpp index ff6db8fa8a..faf6028472 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -20,7 +20,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/gameDetector.h" #include "base/plugins.h" diff --git a/saga/saveload.cpp b/saga/saveload.cpp index c288b131dd..e062bd0283 100644 --- a/saga/saveload.cpp +++ b/saga/saveload.cpp @@ -21,7 +21,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/savefile.h" diff --git a/scumm/actor.cpp b/scumm/actor.cpp index a0551b10ad..5ae5dfb5f1 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/akos.h" diff --git a/scumm/akos.cpp b/scumm/akos.cpp index 65fd9a8483..8ca603fc85 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/akos.h" diff --git a/scumm/base-costume.cpp b/scumm/base-costume.cpp index 89df0607a3..7dde9af10a 100644 --- a/scumm/base-costume.cpp +++ b/scumm/base-costume.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/base-costume.h" #include "scumm/costume.h" diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp index 0a70d75da0..9a50eafa94 100644 --- a/scumm/bomp.cpp +++ b/scumm/bomp.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/akos.h" #include "scumm/bomp.h" diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index d6f308c49b..63ce7fcf12 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/boxes.h" diff --git a/scumm/camera.cpp b/scumm/camera.cpp index 80b95fd74b..205d017903 100644 --- a/scumm/camera.cpp +++ b/scumm/camera.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/intern.h" #include "scumm/actor.h" diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 875b2fcf07..c614b82a88 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/charset.h" #include "scumm/scumm.h" #include "scumm/nut_renderer.h" diff --git a/scumm/costume.cpp b/scumm/costume.cpp index 29e701bd34..f7d85b7971 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/costume.h" diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp index 98f680fd54..18e7675f03 100644 --- a/scumm/cursor.cpp +++ b/scumm/cursor.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "common/util.h" #include "scumm/bomp.h" diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index fac53e82e2..45163bb74c 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -18,7 +18,7 @@ * $Header$ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/file.h" diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index cba5ed83d9..aeef1ec376 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/system.h" diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index db3d530018..7342989f61 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "scumm/scumm.h" #include "scumm/actor.h" diff --git a/scumm/help.cpp b/scumm/help.cpp index 9d690841ca..493c867c96 100644 --- a/scumm/help.cpp +++ b/scumm/help.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/help.h" #include "scumm/scumm.h" #include "common/str.h" diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index fead93c9d6..5570e7c2e1 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/version.h" diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index 20165f41a8..f6f2d71070 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "common/timer.h" diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/scumm/imuse_digi/dimuse_bndmgr.cpp index b076ae0773..35a0414e3d 100644 --- a/scumm/imuse_digi/dimuse_bndmgr.cpp +++ b/scumm/imuse_digi/dimuse_bndmgr.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "scumm/scumm.h" #include "scumm/util.h" diff --git a/scumm/imuse_digi/dimuse_codecs.cpp b/scumm/imuse_digi/dimuse_codecs.cpp index 39ec1d3332..1c59cb9746 100644 --- a/scumm/imuse_digi/dimuse_codecs.cpp +++ b/scumm/imuse_digi/dimuse_codecs.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/util.h" diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index 43490da5e9..0ee5ecd291 100644 --- a/scumm/imuse_digi/dimuse_music.cpp +++ b/scumm/imuse_digi/dimuse_music.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "scumm/scumm.h" #include "scumm/imuse_digi/dimuse.h" diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index b7f3691e35..3113318f0b 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "common/timer.h" diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp index af8aafefd9..ebc0a4db1b 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/util.h" diff --git a/scumm/imuse_digi/dimuse_sndmgr.h b/scumm/imuse_digi/dimuse_sndmgr.h index 4b4d5c488d..2881316174 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.h +++ b/scumm/imuse_digi/dimuse_sndmgr.h @@ -21,7 +21,7 @@ #ifndef IMUSE_DIGI_SNDMGR_H #define IMUSE_DIGI_SNDMGR_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "sound/audiostream.h" #include "scumm/imuse_digi/dimuse_bndmgr.h" diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp index ebb5a718c2..7c5527431d 100644 --- a/scumm/imuse_digi/dimuse_tables.cpp +++ b/scumm/imuse_digi/dimuse_tables.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/imuse_digi/dimuse.h" namespace Scumm { diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index 5a32beff1a..f0fda62f8a 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/timer.h" #include "scumm/actor.h" diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 2502f55d3c..6dbcdd66b4 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -19,7 +19,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "base/engine.h" diff --git a/scumm/input.cpp b/scumm/input.cpp index d3f8071b8d..3a3d0fe813 100644 --- a/scumm/input.cpp +++ b/scumm/input.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/system.h" diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp index 61e0eccb16..22133c0915 100644 --- a/scumm/insane/insane.cpp +++ b/scumm/insane/insane.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" diff --git a/scumm/insane/insane_ben.cpp b/scumm/insane/insane_ben.cpp index 1f56df116a..1184be452a 100644 --- a/scumm/insane/insane_ben.cpp +++ b/scumm/insane/insane_ben.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp index 336166132d..dadaba995c 100644 --- a/scumm/insane/insane_enemy.cpp +++ b/scumm/insane/insane_enemy.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" diff --git a/scumm/insane/insane_iact.cpp b/scumm/insane/insane_iact.cpp index bd53842e38..be341967fa 100644 --- a/scumm/insane/insane_iact.cpp +++ b/scumm/insane/insane_iact.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp index 49a0035e7e..2a549fd307 100644 --- a/scumm/insane/insane_scenes.cpp +++ b/scumm/insane/insane_scenes.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" diff --git a/scumm/instrument.cpp b/scumm/instrument.cpp index 284c562ac7..2c86c53db0 100644 --- a/scumm/instrument.cpp +++ b/scumm/instrument.cpp @@ -19,7 +19,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/saveload.h" #include "scumm/instrument.h" diff --git a/scumm/instrument.h b/scumm/instrument.h index 9e0c397b55..51a0afb081 100644 --- a/scumm/instrument.h +++ b/scumm/instrument.h @@ -22,7 +22,7 @@ #ifndef INSTRUMENT_H #define INSTRUMENT_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" class MidiChannel; diff --git a/scumm/logic_he.cpp b/scumm/logic_he.cpp index 9909fbb0a3..50db5c4a09 100644 --- a/scumm/logic_he.cpp +++ b/scumm/logic_he.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/intern.h" #include "scumm/logic_he.h" diff --git a/scumm/logic_he.h b/scumm/logic_he.h index 66c4333d02..edf704128f 100644 --- a/scumm/logic_he.h +++ b/scumm/logic_he.h @@ -22,7 +22,7 @@ #if !defined(LOGIC_HE_H) && !defined(DISABLE_HE) #define LOGIC_HE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/intern.h" diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp index afffca84f9..5e9280d240 100644 --- a/scumm/midiparser_eup.cpp +++ b/scumm/midiparser_eup.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/midiparser.h" #include "sound/mididrv.h" #include "common/util.h" diff --git a/scumm/midiparser_ro.cpp b/scumm/midiparser_ro.cpp index af93d6f97c..650c449247 100644 --- a/scumm/midiparser_ro.cpp +++ b/scumm/midiparser_ro.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/midiparser.h" #include "sound/mididrv.h" #include "common/util.h" diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp index 6c9a5c976b..d8b6ed0d79 100644 --- a/scumm/nut_renderer.cpp +++ b/scumm/nut_renderer.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/nut_renderer.h" #include "scumm/bomp.h" diff --git a/scumm/object.cpp b/scumm/object.cpp index 262a79a777..a852b4f400 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/bomp.h" diff --git a/scumm/palette.cpp b/scumm/palette.cpp index 76c5f72e6d..f1a49819d0 100644 --- a/scumm/palette.cpp +++ b/scumm/palette.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "common/util.h" diff --git a/scumm/palette_he.cpp b/scumm/palette_he.cpp index 782fc865f6..929481191a 100644 --- a/scumm/palette_he.cpp +++ b/scumm/palette_he.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "common/util.h" #include "scumm/scumm.h" diff --git a/scumm/player_mod.cpp b/scumm/player_mod.cpp index 80d747ff62..6ae58b99c0 100644 --- a/scumm/player_mod.cpp +++ b/scumm/player_mod.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/player_mod.h" #include "sound/mixer.h" #include "sound/rate.h" diff --git a/scumm/player_nes.cpp b/scumm/player_nes.cpp index 278e763978..6cf48fbc1d 100644 --- a/scumm/player_nes.cpp +++ b/scumm/player_nes.cpp @@ -21,7 +21,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "scumm/player_nes.h" #include "scumm/scumm.h" diff --git a/scumm/player_v1.cpp b/scumm/player_v1.cpp index 151f0345d6..0ca5c7af46 100644 --- a/scumm/player_v1.cpp +++ b/scumm/player_v1.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "scumm/player_v1.h" #include "scumm/scumm.h" diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp index 97eba6cecd..a70a4b9a1f 100644 --- a/scumm/player_v2.cpp +++ b/scumm/player_v2.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "scumm/player_v2.h" #include "scumm/scumm.h" diff --git a/scumm/player_v2a.cpp b/scumm/player_v2a.cpp index f913295e8e..24ee173dc1 100644 --- a/scumm/player_v2a.cpp +++ b/scumm/player_v2a.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "scumm/player_v2a.h" #include "scumm/scumm.h" diff --git a/scumm/player_v3a.cpp b/scumm/player_v3a.cpp index e33a258435..8a35f8bb61 100644 --- a/scumm/player_v3a.cpp +++ b/scumm/player_v3a.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "scumm/player_v3a.h" #include "scumm/scumm.h" diff --git a/scumm/resource.cpp b/scumm/resource.cpp index b79b575d37..2d9df5f41f 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/str.h" #include "scumm/charset.h" diff --git a/scumm/resource_v2.cpp b/scumm/resource_v2.cpp index 27b62fde91..d7f92a5de2 100644 --- a/scumm/resource_v2.cpp +++ b/scumm/resource_v2.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/intern.h" diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp index 6d504d8110..4ce8e21efd 100644 --- a/scumm/resource_v3.cpp +++ b/scumm/resource_v3.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/intern.h" #include "scumm/util.h" diff --git a/scumm/resource_v4.cpp b/scumm/resource_v4.cpp index e00c96aa9a..172125f3fd 100644 --- a/scumm/resource_v4.cpp +++ b/scumm/resource_v4.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/intern.h" #include "scumm/resource.h" diff --git a/scumm/resource_v7he.cpp b/scumm/resource_v7he.cpp index 04a3d6ce5d..2240377a63 100644 --- a/scumm/resource_v7he.cpp +++ b/scumm/resource_v7he.cpp @@ -23,7 +23,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/intern.h" #include "scumm/resource.h" diff --git a/scumm/room.cpp b/scumm/room.cpp index 48248dd01e..1b30e54225 100644 --- a/scumm/room.cpp +++ b/scumm/room.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/actor.h" #include "scumm/boxes.h" diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index a146076988..a8c3254cd1 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/savefile.h" diff --git a/scumm/script.cpp b/scumm/script.cpp index 37598b3c53..ad2e2f0366 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/util.h" diff --git a/scumm/script_c64.cpp b/scumm/script_c64.cpp index a52251ec36..8f182af6ea 100644 --- a/scumm/script_c64.cpp +++ b/scumm/script_c64.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/intern.h" diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 5060536b5e..7f79436ff0 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 475cf94ca2..cf7b55200d 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/intern.h" diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 43f657ca3f..0c93bcf491 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/intern.h" diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 29f4fc6a80..34648bac5b 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 870ead68d9..57b897d993 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/savefile.h" diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index f48cca0205..061b23d2cc 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/savefile.h" diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index e525aa6619..2467e30e6a 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index dc05fd1541..33b9c18972 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/system.h" #include "scumm/actor.h" diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index 1d54389c3a..f10316d663 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-file.h" #include "common/config-manager.h" diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index cec3795a48..828ff7d287 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 7c4138bc5e..9ba88fadc6 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/fs/fs.h" diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp index 33ee752301..b2c2b0aeab 100644 --- a/scumm/smush/chunk.cpp +++ b/scumm/smush/chunk.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/smush/chunk.h" #include "scumm/scumm.h" diff --git a/scumm/smush/codec1.cpp b/scumm/smush/codec1.cpp index fb10bb5a6b..b92355a1c5 100644 --- a/scumm/smush/codec1.cpp +++ b/scumm/smush/codec1.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" namespace Scumm { diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp index d76526db79..c7ed741156 100644 --- a/scumm/smush/codec37.cpp +++ b/scumm/smush/codec37.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "scumm/bomp.h" #include "scumm/smush/codec37.h" diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp index fa371b8d83..9715a25a49 100644 --- a/scumm/smush/codec47.cpp +++ b/scumm/smush/codec47.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "scumm/bomp.h" #include "scumm/smush/codec47.h" diff --git a/scumm/smush/imuse_channel.cpp b/scumm/smush/imuse_channel.cpp index 7689974dc7..3adbe4a266 100644 --- a/scumm/smush/imuse_channel.cpp +++ b/scumm/smush/imuse_channel.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/smush/channel.h" #include "scumm/smush/chunk.h" diff --git a/scumm/smush/saud_channel.cpp b/scumm/smush/saud_channel.cpp index 6ef2d8c85a..a72d1c7fe7 100644 --- a/scumm/smush/saud_channel.cpp +++ b/scumm/smush/saud_channel.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/smush/channel.h" #include "scumm/smush/chunk.h" diff --git a/scumm/smush/smush_font.cpp b/scumm/smush/smush_font.cpp index 20e809e5aa..e1b131fa19 100644 --- a/scumm/smush/smush_font.cpp +++ b/scumm/smush/smush_font.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/file.h" #include "scumm/scumm.h" #include "scumm/util.h" diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index b24761ff72..dfb467d541 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "scumm/smush/smush_mixer.h" diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h index cff529b5c6..206a9e0da0 100644 --- a/scumm/smush/smush_mixer.h +++ b/scumm/smush/smush_mixer.h @@ -22,7 +22,7 @@ #ifndef SMUSH_MIXER_H #define SMUSH_MIXER_H -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/sound.h" namespace Scumm { diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 8f8645b5f5..96fa18ed36 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 7382ee113c..22b3132b52 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/actor.h" #include "scumm/imuse.h" #include "scumm/imuse_digi/dimuse.h" diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index ac9e1a1b27..02525e62d2 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/intern.h" #include "scumm/resource.h" diff --git a/scumm/string.cpp b/scumm/string.cpp index 8cba88263a..96a591f09a 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" diff --git a/scumm/usage_bits.cpp b/scumm/usage_bits.cpp index 36b560eba1..2877ab4e53 100644 --- a/scumm/usage_bits.cpp +++ b/scumm/usage_bits.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/usage_bits.h" diff --git a/scumm/vars.cpp b/scumm/vars.cpp index b608dfce99..d48ad18276 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "scumm/scumm.h" #include "scumm/intern.h" diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index 283fda46e7..eae9b5f3d1 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/charset.h" #include "scumm/intern.h" #include "scumm/object.h" diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index 7870afb6fb..aea26c53c7 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "scumm/intern.h" #include "scumm/resource.h" diff --git a/simon/charset.cpp b/simon/charset.cpp index a862f6dd36..6d938c333e 100644 --- a/simon/charset.cpp +++ b/simon/charset.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "simon/simon.h" #include "simon/intern.h" diff --git a/simon/cursor.cpp b/simon/cursor.cpp index 5f3042c22c..cc66507405 100644 --- a/simon/cursor.cpp +++ b/simon/cursor.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "simon/simon.h" #include "simon/intern.h" diff --git a/simon/debug.cpp b/simon/debug.cpp index 3d3c8dbb9a..743783b5cb 100644 --- a/simon/debug.cpp +++ b/simon/debug.cpp @@ -20,7 +20,7 @@ */ // Simon debug functions -#include "stdafx.h" +#include "common/stdafx.h" #include "simon/simon.h" #include "simon/intern.h" #include "simon/debug.h" diff --git a/simon/debugger.cpp b/simon/debugger.cpp index 63522259ce..44bf9be047 100644 --- a/simon/debugger.cpp +++ b/simon/debugger.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/debugger.cpp" #include "simon/debugger.h" diff --git a/simon/icons.cpp b/simon/icons.cpp index 7a6fd6f105..7cb9c223dc 100644 --- a/simon/icons.cpp +++ b/simon/icons.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/file.h" diff --git a/simon/items.cpp b/simon/items.cpp index a7cc3a8d10..77251794ee 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -22,7 +22,7 @@ // Item script opcodes for Simon1/Simon2 #include <ctype.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "simon/simon.h" #include "simon/intern.h" diff --git a/simon/midi.cpp b/simon/midi.cpp index 98dc5bc0d6..1968f02135 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -20,7 +20,7 @@ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "common/file.h" diff --git a/simon/midiparser_s1d.cpp b/simon/midiparser_s1d.cpp index e3a872f326..a61035fbaa 100644 --- a/simon/midiparser_s1d.cpp +++ b/simon/midiparser_s1d.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/midiparser.h" #include "sound/mididrv.h" #include "common/util.h" diff --git a/simon/res.cpp b/simon/res.cpp index c7a6a76127..757997cb8e 100644 --- a/simon/res.cpp +++ b/simon/res.cpp @@ -20,7 +20,7 @@ */ // Resource file routines for Simon1/Simon2 -#include "stdafx.h" +#include "common/stdafx.h" #include "common/file.h" #include "simon/simon.h" #include "simon/intern.h" diff --git a/simon/saveload.cpp b/simon/saveload.cpp index b4cb94f104..56d4207f50 100644 --- a/simon/saveload.cpp +++ b/simon/saveload.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "gui/about.h" #include "gui/message.h" diff --git a/simon/simon.cpp b/simon/simon.cpp index 4a998fcc83..6079b9ab61 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/fs/fs.h" diff --git a/simon/sound.cpp b/simon/sound.cpp index 9e302e34d5..12f6948151 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -17,7 +17,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/file.h" #include "common/util.h" diff --git a/simon/verb.cpp b/simon/verb.cpp index 5dc2eb2118..4f97a8054e 100644 --- a/simon/verb.cpp +++ b/simon/verb.cpp @@ -20,7 +20,7 @@ */ // Verb and hitarea handling -#include "stdafx.h" +#include "common/stdafx.h" #include "simon/simon.h" #include "simon/intern.h" diff --git a/simon/vga.cpp b/simon/vga.cpp index b72657f987..b811a5e5b1 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -20,7 +20,7 @@ */ // Video script opcodes for Simon1/Simon2 -#include "stdafx.h" +#include "common/stdafx.h" #include "simon/simon.h" #include "simon/intern.h" #include "simon/vga.h" diff --git a/sky/autoroute.cpp b/sky/autoroute.cpp index 57c2a5ac70..4e2536c88e 100644 --- a/sky/autoroute.cpp +++ b/sky/autoroute.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "sky/autoroute.h" #include "sky/compact.h" diff --git a/sky/autoroute.h b/sky/autoroute.h index 0ba8b69ea6..dfae763e73 100644 --- a/sky/autoroute.h +++ b/sky/autoroute.h @@ -22,7 +22,7 @@ #ifndef AUTOROUTE_H #define AUTOROUTE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" namespace Sky { diff --git a/sky/compact.cpp b/sky/compact.cpp index 3cc3bad054..13dbc0d241 100644 --- a/sky/compact.cpp +++ b/sky/compact.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "common/file.h" #include "sky/compact.h" diff --git a/sky/control.cpp b/sky/control.cpp index 2ddb0639bb..6d94ef5bfc 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "common/file.h" #include "common/system.h" diff --git a/sky/debug.cpp b/sky/debug.cpp index e33589f962..99dec64521 100644 --- a/sky/debug.cpp +++ b/sky/debug.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "sky/debug.h" #include "sky/grid.h" diff --git a/sky/debug.h b/sky/debug.h index 6eb5b6c0b3..967a397116 100644 --- a/sky/debug.h +++ b/sky/debug.h @@ -22,7 +22,7 @@ #ifndef SKY_DEBUG_H #define SKY_DEBUG_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/debugger.h" diff --git a/sky/disk.cpp b/sky/disk.cpp index a6573d2efe..3f1fa68f7e 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/file.h" #include "common/util.h" #include "common/scummsys.h" diff --git a/sky/disk.h b/sky/disk.h index c885ab65bf..4a702a044d 100644 --- a/sky/disk.h +++ b/sky/disk.h @@ -22,7 +22,7 @@ #ifndef SKYDISK_H #define SKYDISK_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/str.h" #include "sky/rnc_deco.h" diff --git a/sky/grid.h b/sky/grid.h index ea248a99c6..510e7ead01 100644 --- a/sky/grid.h +++ b/sky/grid.h @@ -22,7 +22,7 @@ #ifndef SKYGRID_H #define SKYGRID_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "skydefs.h" diff --git a/sky/intro.cpp b/sky/intro.cpp index f677282c54..faa764ac0a 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "common/system.h" #include "sky/disk.h" diff --git a/sky/intro.h b/sky/intro.h index 1fbf2a4bb0..bb6aab6d88 100644 --- a/sky/intro.h +++ b/sky/intro.h @@ -22,7 +22,7 @@ #ifndef INTRO_H #define INTRO_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "sound/mixer.h" diff --git a/sky/logic.cpp b/sky/logic.cpp index d2cb3b4af3..ad31e658a6 100644 --- a/sky/logic.cpp +++ b/sky/logic.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sky/autoroute.h" #include "sky/compact.h" #include "sky/control.h" diff --git a/sky/logic.h b/sky/logic.h index 04cb09a46f..e6260f90bb 100644 --- a/sky/logic.h +++ b/sky/logic.h @@ -22,7 +22,7 @@ #ifndef SKYLOGIC_H #define SKYLOGIC_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" namespace Sky { diff --git a/sky/mouse.cpp b/sky/mouse.cpp index f628c8a913..24ce9627fe 100644 --- a/sky/mouse.cpp +++ b/sky/mouse.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "sky/disk.h" #include "sky/logic.h" diff --git a/sky/mouse.h b/sky/mouse.h index 7ba467d3f8..66291113a6 100644 --- a/sky/mouse.h +++ b/sky/mouse.h @@ -22,7 +22,7 @@ #ifndef SKYMOUSE_H #define SKYMOUSE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" class OSystem; diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp index 9b85b602f1..c0a54bd49c 100644 --- a/sky/music/adlibchannel.cpp +++ b/sky/music/adlibchannel.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "sky/music/adlibchannel.h" #include "sky/sky.h" diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h index 59ba5ec7cd..ea438d2bb5 100644 --- a/sky/music/musicbase.h +++ b/sky/music/musicbase.h @@ -22,7 +22,7 @@ #ifndef MUSICBASE_H #define MUSICBASE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/mutex.h" diff --git a/sky/rnc_deco.cpp b/sky/rnc_deco.cpp index 43cd82939d..92612d22f7 100644 --- a/sky/rnc_deco.cpp +++ b/sky/rnc_deco.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "sky/rnc_deco.h" diff --git a/sky/rnc_deco.h b/sky/rnc_deco.h index c2389b1a71..092ec46821 100644 --- a/sky/rnc_deco.h +++ b/sky/rnc_deco.h @@ -22,7 +22,7 @@ #ifndef RNC_DECO_H #define RNC_DECO_H -#include "stdafx.h" +#include "common/stdafx.h" #define RNC_SIGNATURE 0x524E4301 // "RNC\001" diff --git a/sky/screen.cpp b/sky/screen.cpp index ab2f3d66b5..8b7e593ae7 100644 --- a/sky/screen.cpp +++ b/sky/screen.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/system.h" #include "sky/disk.h" #include "sky/logic.h" diff --git a/sky/screen.h b/sky/screen.h index b2ad385361..5ad5db860b 100644 --- a/sky/screen.h +++ b/sky/screen.h @@ -22,7 +22,7 @@ #ifndef SKYSCREEN_H #define SKYSCREEN_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "sky/skydefs.h" diff --git a/sky/sky.cpp b/sky/sky.cpp index 47458e431f..151daa1c1e 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "backends/fs/fs.h" @@ -22,7 +22,7 @@ #ifndef SKYMAIN_H #define SKYMAIN_H -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" class GameDetector; diff --git a/sky/skydefs.h b/sky/skydefs.h index b89bfe265c..1fc88b9a8a 100644 --- a/sky/skydefs.h +++ b/sky/skydefs.h @@ -22,7 +22,7 @@ #ifndef SKYDEFS_H #define SKYDEFS_H -#include "stdafx.h" +#include "common/stdafx.h" namespace Sky { diff --git a/sky/sound.cpp b/sky/sound.cpp index a9a1708846..7712969e76 100644 --- a/sky/sound.cpp +++ b/sky/sound.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sky/disk.h" #include "sky/logic.h" #include "sky/sky.h" diff --git a/sky/sound.h b/sky/sound.h index 1305369190..f4d473b6cc 100644 --- a/sky/sound.h +++ b/sky/sound.h @@ -22,7 +22,7 @@ #ifndef SKYSOUND_H #define SKYSOUND_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "sound/mixer.h" diff --git a/sky/text.h b/sky/text.h index cb2c5c5157..cc727f7a74 100644 --- a/sky/text.h +++ b/sky/text.h @@ -22,7 +22,7 @@ #ifndef SKYTEXT_H #define SKYTEXT_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" namespace Sky { diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp index b20285a795..d04cb7c67c 100644 --- a/sound/adpcm.cpp +++ b/sound/adpcm.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/stream.h" #include "sound/audiostream.h" diff --git a/sound/adpcm.h b/sound/adpcm.h index cd240f8829..1994164b67 100644 --- a/sound/adpcm.h +++ b/sound/adpcm.h @@ -22,7 +22,7 @@ #ifndef SOUND_ADPCM_H #define SOUND_ADPCM_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" class AudioStream; diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index 891133bc5d..ab894724d4 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/audiocd.h" #include "sound/mp3.h" diff --git a/sound/audiocd.h b/sound/audiocd.h index 33d5848c6b..f0231876d3 100644 --- a/sound/audiocd.h +++ b/sound/audiocd.h @@ -22,7 +22,7 @@ #ifndef SOUND_AUDIOCD_H #define SOUND_AUDIOCD_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/singleton.h" #include "sound/mixer.h" diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index c9bd43e51c..e8ac3a4ab3 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/file.h" #include "common/util.h" #include "sound/audiostream.h" diff --git a/sound/audiostream.h b/sound/audiostream.h index df51d11897..13a70afa65 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -22,7 +22,7 @@ #ifndef AUDIOSTREAM_H #define AUDIOSTREAM_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "common/scummsys.h" diff --git a/sound/flac.h b/sound/flac.h index 2250f342ea..5d8263f766 100644 --- a/sound/flac.h +++ b/sound/flac.h @@ -22,7 +22,7 @@ #ifndef SOUND_FLAC_H #define SOUND_FLAC_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #ifdef USE_FLAC diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp index 40a73e465e..958929853a 100644 --- a/sound/fmopl.cpp +++ b/sound/fmopl.cpp @@ -22,7 +22,7 @@ * Tatsuyuki Satoh. Included from LGPL'ed AdPlug. */ -#include "stdafx.h" +#include "common/stdafx.h" #include <stdio.h> #include <stdlib.h> diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 35da9cb015..45a7031f7a 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "base/engine.h" #include "common/config-manager.h" diff --git a/sound/midiparser.cpp b/sound/midiparser.cpp index 046ab17be7..0ac9427857 100644 --- a/sound/midiparser.cpp +++ b/sound/midiparser.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "midiparser.h" #include "mididrv.h" #include "common/util.h" diff --git a/sound/midiparser_smf.cpp b/sound/midiparser_smf.cpp index e23856c0f6..f0d6a2540f 100644 --- a/sound/midiparser_smf.cpp +++ b/sound/midiparser_smf.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "midiparser.h" #include "mididrv.h" #include "common/util.h" diff --git a/sound/midiparser_xmidi.cpp b/sound/midiparser_xmidi.cpp index 3b86424c46..5a9e37cc5f 100644 --- a/sound/midiparser_xmidi.cpp +++ b/sound/midiparser_xmidi.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "midiparser.h" #include "mididrv.h" #include "common/util.h" diff --git a/sound/mixer.cpp b/sound/mixer.cpp index b2d46322fa..f97c563ccf 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/file.h" #include "common/util.h" diff --git a/sound/mixer.h b/sound/mixer.h index c062437a0c..001753301a 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -23,7 +23,7 @@ #ifndef SOUND_MIXER_H #define SOUND_MIXER_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #include "common/mutex.h" diff --git a/sound/mp3.h b/sound/mp3.h index 27886686ce..642d87e11f 100644 --- a/sound/mp3.h +++ b/sound/mp3.h @@ -22,7 +22,7 @@ #ifndef SOUND_MP3_H #define SOUND_MP3_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #ifdef USE_MAD diff --git a/sound/mpu401.cpp b/sound/mpu401.cpp index 00e867cf3a..1aa8e19ff0 100644 --- a/sound/mpu401.cpp +++ b/sound/mpu401.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "mpu401.h" #include "common/timer.h" #include "common/util.h" // for ARRAYSIZE diff --git a/sound/mpu401.h b/sound/mpu401.h index 6dc391aaca..20d722ce22 100644 --- a/sound/mpu401.h +++ b/sound/mpu401.h @@ -22,7 +22,7 @@ #ifndef SOUND_MPU401_H #define SOUND_MPU401_H -#include "stdafx.h" +#include "common/stdafx.h" #include "mididrv.h" //////////////////////////////////////// diff --git a/sound/rate.cpp b/sound/rate.cpp index 4ab935331c..eedc283cc6 100644 --- a/sound/rate.cpp +++ b/sound/rate.cpp @@ -27,7 +27,7 @@ * improvments over the original code were made. */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/audiostream.h" #include "sound/rate.h" #include "sound/mixer.h" diff --git a/sound/softsynth/emumidi.h b/sound/softsynth/emumidi.h index 9fd0113a7f..579aebeeff 100644 --- a/sound/softsynth/emumidi.h +++ b/sound/softsynth/emumidi.h @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/audiostream.h" #include "sound/mididrv.h" #include "sound/mixer.h" diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp index 37ceb5f48f..5bcf0993af 100644 --- a/sound/softsynth/fluidsynth.cpp +++ b/sound/softsynth/fluidsynth.cpp @@ -24,7 +24,7 @@ #ifdef USE_FLUIDSYNTH -#include "stdafx.h" +#include "common/stdafx.h" #include "common/config-manager.h" #include "sound/mpu401.h" #include "sound/softsynth/emumidi.h" diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp index c79abd28ba..94373b980a 100644 --- a/sound/softsynth/mt32.cpp +++ b/sound/softsynth/mt32.cpp @@ -18,7 +18,7 @@ * $Header$ */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #ifdef USE_MT32EMU diff --git a/sound/softsynth/mt32/freeverb.cpp b/sound/softsynth/mt32/freeverb.cpp index 46193a5f4b..42865c1e71 100644 --- a/sound/softsynth/mt32/freeverb.cpp +++ b/sound/softsynth/mt32/freeverb.cpp @@ -30,7 +30,7 @@ // http://www.dreampoint.co.uk // This code is public domain -#include "stdafx.h" +#include "common/stdafx.h" #include "sound/softsynth/mt32/freeverb.h" comb::comb() { diff --git a/sound/voc.cpp b/sound/voc.cpp index 5df91afad3..52e8a46849 100644 --- a/sound/voc.cpp +++ b/sound/voc.cpp @@ -20,7 +20,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "common/stream.h" diff --git a/sound/voc.h b/sound/voc.h index 415483559d..86b7a71f78 100644 --- a/sound/voc.h +++ b/sound/voc.h @@ -23,7 +23,7 @@ #ifndef SOUND_VOC_H #define SOUND_VOC_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" class AudioStream; diff --git a/sound/vorbis.h b/sound/vorbis.h index 293af1e378..6f3796afff 100644 --- a/sound/vorbis.h +++ b/sound/vorbis.h @@ -22,7 +22,7 @@ #ifndef SOUND_VORBIS_H #define SOUND_VORBIS_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" #ifdef USE_VORBIS diff --git a/sound/wave.cpp b/sound/wave.cpp index 911c4cbdbe..42c1bd34db 100644 --- a/sound/wave.cpp +++ b/sound/wave.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "common/stream.h" diff --git a/sound/wave.h b/sound/wave.h index c28ca7222b..a8719af024 100644 --- a/sound/wave.h +++ b/sound/wave.h @@ -22,7 +22,7 @@ #ifndef SOUND_WAVE_H #define SOUND_WAVE_H -#include "stdafx.h" +#include "common/stdafx.h" #include "common/scummsys.h" class AudioStream; diff --git a/sword1/control.h b/sword1/control.h index cda29b5ae2..26f976daea 100644 --- a/sword1/control.h +++ b/sword1/control.h @@ -22,7 +22,7 @@ #ifndef BSCONTROL_H #define BSCONTROL_H -#include "scummsys.h" +#include "common/scummsys.h" #include "sword1/sworddefs.h" class OSystem; diff --git a/sword1/credits.cpp b/sword1/credits.cpp index 55587406b1..393318f545 100644 --- a/sword1/credits.cpp +++ b/sword1/credits.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/credits.h" #include "sword1/screen.h" diff --git a/sword1/debug.cpp b/sword1/debug.cpp index 1d6506d69e..a93b4c646a 100644 --- a/sword1/debug.cpp +++ b/sword1/debug.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "sword1/debug.h" diff --git a/sword1/debug.h b/sword1/debug.h index 640b64b76a..8804ecaef0 100644 --- a/sword1/debug.h +++ b/sword1/debug.h @@ -22,7 +22,7 @@ #ifndef BSDEBUG_H #define BSDEBUG_H -#include "scummsys.h" +#include "common/scummsys.h" namespace Sword1 { diff --git a/sword1/eventman.cpp b/sword1/eventman.cpp index 0fc60cb881..02ba1874ab 100644 --- a/sword1/eventman.cpp +++ b/sword1/eventman.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/eventman.h" #include "sword1/sworddefs.h" #include "common/util.h" diff --git a/sword1/logic.cpp b/sword1/logic.cpp index 9206007616..6a872eb57f 100644 --- a/sword1/logic.cpp +++ b/sword1/logic.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "common/util.h" #include "sword1/logic.h" diff --git a/sword1/memman.cpp b/sword1/memman.cpp index ab26f02ac4..55570b90db 100644 --- a/sword1/memman.cpp +++ b/sword1/memman.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/memman.h" #include "common/util.h" diff --git a/sword1/memman.h b/sword1/memman.h index f2c003e95d..277159785e 100644 --- a/sword1/memman.h +++ b/sword1/memman.h @@ -22,7 +22,7 @@ #ifndef MEMMAN_H #define MEMMAN_H -#include "scummsys.h" +#include "common/scummsys.h" namespace Sword1 { diff --git a/sword1/menu.cpp b/sword1/menu.cpp index 1e7bc4d196..c3b0b5eb6d 100644 --- a/sword1/menu.cpp +++ b/sword1/menu.cpp @@ -19,12 +19,12 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/menu.h" #include "sword1/resman.h" -#include "scummsys.h" +#include "common/scummsys.h" #include "common/util.h" -#include "system.h" +#include "common/system.h" #include "sword1/mouse.h" #include "sword1/screen.h" #include "sword1/logic.h" diff --git a/sword1/mouse.cpp b/sword1/mouse.cpp index 3bf17f778c..4550b5c93f 100644 --- a/sword1/mouse.cpp +++ b/sword1/mouse.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/mouse.h" #include "sword1/menu.h" #include "sword1/screen.h" @@ -27,7 +27,7 @@ #include "sword1/resman.h" #include "sword1/objectman.h" #include "sword1/sworddefs.h" -#include "system.h" +#include "common/system.h" #include "sword1/swordres.h" #include "sword1/menu.h" diff --git a/sword1/mouse.h b/sword1/mouse.h index 923b70b27e..59f55fc323 100644 --- a/sword1/mouse.h +++ b/sword1/mouse.h @@ -22,7 +22,7 @@ #ifndef BSMOUSE_H #define BSMOUSE_H -#include "scummsys.h" +#include "common/scummsys.h" #include "sword1/sworddefs.h" #include "sword1/object.h" diff --git a/sword1/music.cpp b/sword1/music.cpp index 02eb47714c..6d3efe5f80 100644 --- a/sword1/music.cpp +++ b/sword1/music.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/music.h" diff --git a/sword1/music.h b/sword1/music.h index d3dd46ccd1..8e28cc3fd6 100644 --- a/sword1/music.h +++ b/sword1/music.h @@ -22,7 +22,7 @@ #ifndef BSMUSIC_H #define BSMUSIC_H -#include "scummsys.h" +#include "common/scummsys.h" #include "common/mutex.h" #include "common/file.h" #include "sound/audiostream.h" diff --git a/sword1/object.h b/sword1/object.h index 75e066aa90..119dd497d1 100644 --- a/sword1/object.h +++ b/sword1/object.h @@ -22,7 +22,7 @@ #ifndef BSOBJECT_H #define BSOBJECT_H -#include "scummsys.h" +#include "common/scummsys.h" namespace Sword1 { diff --git a/sword1/objectman.cpp b/sword1/objectman.cpp index 3358e2b53f..37b79a4fc2 100644 --- a/sword1/objectman.cpp +++ b/sword1/objectman.cpp @@ -19,9 +19,9 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/objectman.h" -#include "scummsys.h" +#include "common/scummsys.h" #include "common/util.h" #include "sword1/sworddefs.h" #include "sword1/swordres.h" diff --git a/sword1/resman.cpp b/sword1/resman.cpp index 4d7f29d07a..5a1b4683b7 100644 --- a/sword1/resman.cpp +++ b/sword1/resman.cpp @@ -19,8 +19,8 @@ * */ -#include "stdafx.h" -#include "scummsys.h" +#include "common/stdafx.h" +#include "common/scummsys.h" #include "sword1/memman.h" #include "sword1/resman.h" #include "sword1/sworddefs.h" diff --git a/sword1/router.cpp b/sword1/router.cpp index e8c3296f45..a126adedbc 100644 --- a/sword1/router.cpp +++ b/sword1/router.cpp @@ -19,10 +19,10 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/router.h" #include "common/util.h" -#include "scummsys.h" +#include "common/scummsys.h" #include "sword1/swordres.h" #include "sword1/sworddefs.h" #include "sword1/objectman.h" diff --git a/sword1/router.h b/sword1/router.h index 397439c814..709b56fd36 100644 --- a/sword1/router.h +++ b/sword1/router.h @@ -22,7 +22,7 @@ #ifndef BSROUTER_H #define BSROUTER_H -#include "scummsys.h" +#include "common/scummsys.h" #include "sword1/object.h" namespace Sword1 { diff --git a/sword1/screen.cpp b/sword1/screen.cpp index 994419261b..af156e90de 100644 --- a/sword1/screen.cpp +++ b/sword1/screen.cpp @@ -19,9 +19,9 @@ * */ -#include "stdafx.h" -#include "scummsys.h" -#include "system.h" +#include "common/stdafx.h" +#include "common/scummsys.h" +#include "common/system.h" #include "common/util.h" #include "sword1/screen.h" #include "sword1/logic.h" diff --git a/sword1/sound.cpp b/sword1/sound.cpp index 2673c9fc92..94c7eb13db 100644 --- a/sword1/sound.cpp +++ b/sword1/sound.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/sound.h" #include "common/util.h" #include "sword1/resman.h" diff --git a/sword1/staticres.cpp b/sword1/staticres.cpp index 0ce9f90c89..c2cba8fc6d 100644 --- a/sword1/staticres.cpp +++ b/sword1/staticres.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/sworddefs.h" #include "sword1/swordres.h" #include "sword1/screen.h" diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index 87c9d3d46e..a07cb499e1 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1.h" #include "backends/fs/fs.h" diff --git a/sword1/text.cpp b/sword1/text.cpp index aa92b28aaa..5ff35811dd 100644 --- a/sword1/text.cpp +++ b/sword1/text.cpp @@ -19,7 +19,7 @@ * */ -#include "stdafx.h" +#include "common/stdafx.h" #include "sword1/text.h" #include "sword1/resman.h" #include "sword1/objectman.h" diff --git a/test/common/array.h b/test/common/array.h index cfef3553e5..1f24dfd6b6 100644 --- a/test/common/array.h +++ b/test/common/array.h @@ -1,6 +1,6 @@ #include <cxxtest/TestSuite.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "common/array.h" class ArrayTestSuite : public CxxTest::TestSuite diff --git a/test/common/list.h b/test/common/list.h index f5a02af159..512a4d947e 100644 --- a/test/common/list.h +++ b/test/common/list.h @@ -1,6 +1,6 @@ #include <cxxtest/TestSuite.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "common/list.h" class ListTestSuite : public CxxTest::TestSuite diff --git a/test/common/map.h b/test/common/map.h index f4ab71b960..3c738f2653 100644 --- a/test/common/map.h +++ b/test/common/map.h @@ -1,6 +1,6 @@ #include <cxxtest/TestSuite.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "common/map.h" class MapTestSuite : public CxxTest::TestSuite diff --git a/test/common/str.h b/test/common/str.h index e392c5aba8..58b890d800 100644 --- a/test/common/str.h +++ b/test/common/str.h @@ -1,6 +1,6 @@ #include <cxxtest/TestSuite.h> -#include "stdafx.h" +#include "common/stdafx.h" #include "common/str.h" class StringTestSuite : public CxxTest::TestSuite |