thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some broken #include's (the PS2 and Symbian may need more fixed, though)

Browse source 
svn-id: r23666
This commit is contained in:
Max Horn 2006-08-04 17:47:57 +00:00
parent d74bc3fe3a
commit 4ee581adb5
18 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/platform/ps2/DmaPipe.h
View file

@ -26,7 +26,7 @@
#define __DMAPIPE_H__
#include "sysdefs.h"
#include "backends/ps2/GsDefs.h"
#include "backends/platform/ps2/GsDefs.h"
class SinglePipe;

2
backends/platform/ps2/Gs2dScreen.h
View file

@ -24,7 +24,7 @@
#define __GS2DSCREEN_H__
#include "sysdefs.h"
#include "backends/ps2/DmaPipe.h"
#include "backends/platform/ps2/DmaPipe.h"
enum TVMode {
TV_DONT_CARE = 0,

4
backends/platform/ps2/fileio.cpp
View file

@ -20,14 +20,14 @@
*
*/
#include "backends/ps2/fileio.h"
#include "backends/platform/ps2/fileio.h"
#include <tamtypes.h>
#include <kernel.h>
#include <fileio.h>
#include <assert.h>
#include <string.h>
#include "backends/ps2/asyncfio.h"
#include "backends/platform/ps2/asyncfio.h"
#include "base/engine.h"
#include "common/file.h"
#include "eecodyvdfs.h"

6
backends/platform/ps2/icon.cpp
View file

@ -20,9 +20,9 @@
*
*/
#include "backends/ps2/savefile.h"
#include "backends/ps2/Gs2dScreen.h"
#include "backends/ps2/GsDefs.h"
#include "backends/platform/ps2/savefile.h"
#include "backends/platform/ps2/Gs2dScreen.h"
#include "backends/platform/ps2/GsDefs.h"
const iconIVECTOR Ps2SaveFileManager::_bgcolor[4] = {
{ 68, 23, 116, 0 }, // top left

2
backends/platform/ps2/irxboot.cpp
View file

@ -27,7 +27,7 @@
#include <sifrpc.h>
#include <loadfile.h>
#include <malloc.h>
#include "backends/ps2/irxboot.h"
#include "backends/platform/ps2/irxboot.h"
extern void sioprintf(const char *zFormat, ...);

10
backends/platform/ps2/ps2input.cpp
View file

@ -24,11 +24,11 @@
#include <malloc.h>
#include <assert.h>
#include <libmouse.h>
#include "backends/ps2/rpckbd.h"
#include "backends/ps2/ps2input.h"
#include "backends/ps2/ps2pad.h"
#include "backends/ps2/systemps2.h"
#include "backends/ps2/sdlkeys.h"
#include "backends/platform/ps2/rpckbd.h"
#include "backends/platform/ps2/ps2input.h"
#include "backends/platform/ps2/ps2pad.h"
#include "backends/platform/ps2/systemps2.h"
#include "backends/platform/ps2/sdlkeys.h"
#include "common/system.h"
Ps2Input::Ps2Input(OSystem_PS2 *system, bool mouseLoaded, bool kbdLoaded) {

2
backends/platform/ps2/ps2mutex.cpp
View file

@ -20,7 +20,7 @@
*
*/
#include "backends/ps2/systemps2.h"
#include "backends/platform/ps2/systemps2.h"
OSystem::MutexRef OSystem_PS2::createMutex(void) {
WaitSema(_mutexSema);

4
backends/platform/ps2/ps2pad.cpp
View file

@ -23,8 +23,8 @@
#include <kernel.h>
#include <malloc.h>
#include <assert.h>
#include "backends/ps2/systemps2.h"
#include "backends/ps2/ps2pad.h"
#include "backends/platform/ps2/systemps2.h"
#include "backends/platform/ps2/ps2pad.h"
Ps2Pad::Ps2Pad(OSystem_PS2 *system) {
_system = system;

2
backends/platform/ps2/ps2time.cpp
View file

@ -20,7 +20,7 @@
*
*/
#include "backends/ps2/systemps2.h"
#include "backends/platform/ps2/systemps2.h"
#include "eecodyvdfs.h"
#include <osd_config.h>
#define FROM_BCD(a) ((a >> 4) * 10 + (a & 0xF))

6
backends/platform/ps2/savefile.cpp
View file

@ -28,9 +28,9 @@
#include <malloc.h>
#include <ucl/ucl.h>
#include <libmc.h>
#include "backends/ps2/savefile.h"
#include "backends/ps2/Gs2dScreen.h"
#include "backends/ps2/systemps2.h"
#include "backends/platform/ps2/savefile.h"
#include "backends/platform/ps2/Gs2dScreen.h"
#include "backends/platform/ps2/systemps2.h"
#include "common/scummsys.h"
extern void *_gp;

16
backends/platform/ps2/systemps2.cpp
View file

@ -34,21 +34,21 @@
#include "common/scummsys.h"
#include "../intern.h"
#include "base/engine.h"
#include "backends/ps2/systemps2.h"
#include "backends/ps2/Gs2dScreen.h"
#include "backends/ps2/ps2input.h"
#include "backends/ps2/irxboot.h"
#include "backends/platform/ps2/systemps2.h"
#include "backends/platform/ps2/Gs2dScreen.h"
#include "backends/platform/ps2/ps2input.h"
#include "backends/platform/ps2/irxboot.h"
#include <sjpcm.h>
#include <libhdd.h>
#include "backends/ps2/savefile.h"
#include "backends/platform/ps2/savefile.h"
#include "common/file.h"
#include "backends/ps2/sysdefs.h"
#include "backends/platform/ps2/sysdefs.h"
#include <libmc.h>
#include <libpad.h>
#include "backends/ps2/cd.h"
#include "backends/platform/ps2/cd.h"
#include <sio.h>
#include <fileXio_rpc.h>
#include "backends/ps2/asyncfio.h"
#include "backends/platform/ps2/asyncfio.h"
#include "eecodyvdfs.h"
#include "graphics/surface.h"
#include "graphics/font.h"

4
backends/platform/symbian/src/ScummApp.cpp
View file

@ -22,8 +22,8 @@
* $Id$
*/
#include "backends/symbian/src/ScummApp.h"
#include "backends/symbian/src/ScummVM.hrh"
#include "backends/platform/symbian/src/ScummApp.h"
#include "backends/platform/symbian/src/ScummVM.hrh"
#define _PAGESIZE_ 0x1000

2
backends/platform/symbian/src/SymbianActions.cpp
View file

@ -21,7 +21,7 @@
*/
#include "common/stdafx.h"
#include "backends/symbian/src/SymbianActions.h"
#include "backends/platform/symbian/src/SymbianActions.h"
#include "gui/message.h"
#include "scumm/scumm.h"

4
backends/platform/symbian/src/SymbianOS.cpp
View file

@ -22,8 +22,8 @@
* $Id$
*/
#include "backends/symbian/src/SymbianOS.h"
#include "backends/symbian/src/SymbianActions.h"
#include "backends/platform/symbian/src/SymbianOS.h"
#include "backends/platform/symbian/src/SymbianActions.h"
#include "common/config-manager.h"
#include "gui/Actions.h"
#include "gui/Key.h"

2
base/main.cpp
View file

@ -46,7 +46,7 @@
#include "sound/mididrv.h"
#if defined(_WIN32_WCE)
#include "backends/wince/CELauncherDialog.h"
#include "backends/platform/wince/CELauncherDialog.h"
#elif defined(__DC__)
#include "backends/platform/dc/DCLauncherDialog.h"
#else

2
common/config-manager.cpp
View file

@ -30,7 +30,7 @@
DECLARE_SINGLETON(Common::ConfigManager);
#ifdef __PLAYSTATION2__
#include "backends/ps2/systemps2.h"
#include "backends/platform/ps2/systemps2.h"
#endif
#if defined(UNIX)

2
common/scummsys.h
View file

@ -441,7 +441,7 @@
// for those replaced fopen/fread/etc functions
typedef unsigned long uint64;
typedef signed long int64;
#include "backends/ps2/fileio.h"
#include "backends/platform/ps2/fileio.h"
#endif

6
gui/Actions.cpp
View file

@ -27,10 +27,10 @@
#include "common/config-manager.h"
#ifdef _WIN32_WCE
#include "backends/wince/CEActionsPocket.h"
#include "backends/wince/CEActionsSmartphone.h"
#include "backends/platform/wince/CEActionsPocket.h"
#include "backends/platform/wince/CEActionsSmartphone.h"
#elif defined(__SYMBIAN32__)
#include "backends/symbian/src/SymbianActions.h"
#include "backends/platform/symbian/src/SymbianActions.h"
#endif
namespace GUI {