[Scummvm-cvs-logs] SF.net SVN: scummvm: [23666] scummvm/trunk/gui

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Aug 4 19:48:39 CEST 2006


Revision: 23666
Author:   fingolfin
Date:     2006-08-04 10:47:57 -0700 (Fri, 04 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23666&view=rev

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

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ps2/DmaPipe.h
    scummvm/trunk/backends/platform/ps2/Gs2dScreen.h
    scummvm/trunk/backends/platform/ps2/fileio.cpp
    scummvm/trunk/backends/platform/ps2/icon.cpp
    scummvm/trunk/backends/platform/ps2/irxboot.cpp
    scummvm/trunk/backends/platform/ps2/ps2input.cpp
    scummvm/trunk/backends/platform/ps2/ps2mutex.cpp
    scummvm/trunk/backends/platform/ps2/ps2pad.cpp
    scummvm/trunk/backends/platform/ps2/ps2time.cpp
    scummvm/trunk/backends/platform/ps2/savefile.cpp
    scummvm/trunk/backends/platform/ps2/systemps2.cpp
    scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp
    scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/trunk/base/main.cpp
    scummvm/trunk/common/config-manager.cpp
    scummvm/trunk/common/scummsys.h
    scummvm/trunk/gui/Actions.cpp
Modified: scummvm/trunk/backends/platform/ps2/DmaPipe.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/DmaPipe.h	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/DmaPipe.h	2006-08-04 17:47:57 UTC (rev 23666)
@@ -26,7 +26,7 @@
 #define __DMAPIPE_H__
 
 #include "sysdefs.h"
-#include "backends/ps2/GsDefs.h"
+#include "backends/platform/ps2/GsDefs.h"
 
 class SinglePipe;
 

Modified: scummvm/trunk/backends/platform/ps2/Gs2dScreen.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/Gs2dScreen.h	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/Gs2dScreen.h	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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,

Modified: scummvm/trunk/backends/platform/ps2/fileio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/fileio.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/fileio.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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"

Modified: scummvm/trunk/backends/platform/ps2/icon.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/icon.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/icon.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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

Modified: scummvm/trunk/backends/platform/ps2/irxboot.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/irxboot.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/irxboot.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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, ...);
 

Modified: scummvm/trunk/backends/platform/ps2/ps2input.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/ps2input.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/ps2input.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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) {

Modified: scummvm/trunk/backends/platform/ps2/ps2mutex.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/ps2mutex.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/ps2mutex.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -20,7 +20,7 @@
  *
  */
 
-#include "backends/ps2/systemps2.h"
+#include "backends/platform/ps2/systemps2.h"
 
 OSystem::MutexRef OSystem_PS2::createMutex(void) {
 	WaitSema(_mutexSema);

Modified: scummvm/trunk/backends/platform/ps2/ps2pad.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/ps2pad.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/ps2pad.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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;

Modified: scummvm/trunk/backends/platform/ps2/ps2time.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/ps2time.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/ps2time.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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))

Modified: scummvm/trunk/backends/platform/ps2/savefile.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/savefile.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/savefile.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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;

Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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"

Modified: scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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
 

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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"

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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"

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/base/main.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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

Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/common/config-manager.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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)

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/common/scummsys.h	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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
 
 

Modified: scummvm/trunk/gui/Actions.cpp
===================================================================
--- scummvm/trunk/gui/Actions.cpp	2006-08-04 17:34:23 UTC (rev 23665)
+++ scummvm/trunk/gui/Actions.cpp	2006-08-04 17:47:57 UTC (rev 23666)
@@ -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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list