Make PalmOS happy

svn-id: r15632

sword1/control.h

@@ -23,7 +23,7 @@
 #define BSCONTROL_H
 
 #include "scummsys.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 class OSystem;
 class SaveFileManager;

sword1/debug.cpp

@@ -20,8 +20,8 @@
  */
 
 #include "stdafx.h"
-#include "debug.h"
 #include "common/util.h"
+#include "sword1/debug.h"
 
 namespace Sword1 {
 

sword1/eventman.cpp

@@ -20,8 +20,8 @@
  */
 
 #include "stdafx.h"
-#include "eventman.h"
-#include "sworddefs.h"
+#include "sword1/eventman.h"
+#include "sword1/sworddefs.h"
 #include "common/util.h"
 
 namespace Sword1 {

sword1/eventman.h

@@ -22,7 +22,7 @@
 #ifndef BSEVENTMAN_H
 #define BSEVENTMAN_H
 
-#include "object.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 

sword1/logic.cpp

@@ -20,21 +20,22 @@
  */
 
 #include "stdafx.h"
-#include "logic.h"
-#include "text.h"
-#include "sound.h"
-#include "eventman.h"
-#include "menu.h"
 #include "common/util.h"
-#include "router.h"
-#include "screen.h"
-#include "mouse.h"
-#include "sword1.h"
-#include "music.h"
-#include "swordres.h"
-#include "animation.h"
 
-#include "debug.h"
+#include "sword1/logic.h"
+#include "sword1/text.h"
+#include "sword1/sound.h"
+#include "sword1/eventman.h"
+#include "sword1/menu.h"
+#include "sword1/router.h"
+#include "sword1/screen.h"
+#include "sword1/mouse.h"
+#include "sword1/sword1.h"
+#include "sword1/music.h"
+#include "sword1/swordres.h"
+#include "sword1/animation.h"
+
+#include "sword1/debug.h"
 
 namespace Sword1 {
 

sword1/logic.h

@@ -23,8 +23,8 @@
 #define BSLOGIC_H
 // combination of logic.c and scr_int.c
 
-#include "sworddefs.h"
-#include "objectman.h"
+#include "sword1/sworddefs.h"
+#include "sword1/objectman.h"
 #include "common/util.h"
 #include "sound/mixer.h"
 

sword1/memman.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "stdafx.h"
-#include "memman.h"
+#include "sword1/memman.h"
 #include "common/util.h"
 
 namespace Sword1 {

sword1/menu.cpp

@@ -20,14 +20,14 @@
  */
 
 #include "stdafx.h"
-#include "menu.h"
-#include "resman.h"
+#include "sword1/menu.h"
+#include "sword1/resman.h"
 #include "scummsys.h"
 #include "common/util.h"
 #include "system.h"
-#include "mouse.h"
-#include "screen.h"
-#include "logic.h"
+#include "sword1/mouse.h"
+#include "sword1/screen.h"
+#include "sword1/logic.h"
 
 namespace Sword1 {
 

sword1/menu.h

@@ -22,8 +22,8 @@
 #ifndef BSMENU_H
 #define BSMENU_H
 
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 

sword1/mouse.cpp

@@ -20,16 +20,16 @@
  */
 
 #include "stdafx.h"
-#include "mouse.h"
-#include "menu.h"
-#include "screen.h"
-#include "logic.h"
-#include "resman.h"
-#include "objectman.h"
-#include "sworddefs.h"
+#include "sword1/mouse.h"
+#include "sword1/menu.h"
+#include "sword1/screen.h"
+#include "sword1/logic.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
+#include "sword1/sworddefs.h"
 #include "system.h"
-#include "swordres.h"
-#include "menu.h"
+#include "sword1/swordres.h"
+#include "sword1/menu.h"
 
 namespace Sword1 {
 

sword1/mouse.h

@@ -23,8 +23,8 @@
 #define BSMOUSE_H
 
 #include "scummsys.h"
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
 
 class OSystem;
 

sword1/music.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "stdafx.h"
-#include "music.h"
+#include "sword1/music.h"
 #include "sound/mixer.h"
 #include "common/util.h"
 #include "common/file.h"

sword1/objectman.cpp

@@ -20,12 +20,12 @@
  */
 
 #include "stdafx.h"
-#include "objectman.h"
+#include "sword1/objectman.h"
 #include "scummsys.h"
 #include "common/util.h"
-#include "sworddefs.h"
-#include "swordres.h"
-#include "sword1.h"
+#include "sword1/sworddefs.h"
+#include "sword1/swordres.h"
+#include "sword1/sword1.h"
 
 namespace Sword1 {
 

sword1/objectman.h

@@ -25,8 +25,8 @@
 #define OBJECTMAN_H
 
 #include "resman.h"
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 
@@ -63,4 +63,3 @@ private:
 } // End of namespace Sword1 
 
 #endif //OBJECTMAN_H
-

sword1/resman.h

@@ -22,9 +22,9 @@
 #ifndef RESMAN_H
 #define RESMAN_H
 
-#include "memman.h"
+#include "sword1/memman.h"
 #include "file.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {
 

sword1/router.cpp

@@ -20,13 +20,13 @@
  */
 
 #include "stdafx.h"
-#include "router.h"
+#include "sword1/router.h"
 #include "common/util.h"
 #include "scummsys.h"
-#include "swordres.h"
-#include "sworddefs.h"
-#include "objectman.h"
-#include "resman.h"
+#include "sword1/swordres.h"
+#include "sword1/sworddefs.h"
+#include "sword1/objectman.h"
+#include "sword1/resman.h"
 
 namespace Sword1 {
 

sword1/router.h

@@ -23,7 +23,7 @@
 #define BSROUTER_H
 
 #include "scummsys.h"
-#include "object.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 

sword1/screen.h

@@ -22,7 +22,7 @@
 #ifndef BSSCREEN_H
 #define BSSCREEN_H
 
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 class OSystem;
 

sword1/sound.cpp

@@ -20,11 +20,11 @@
  */
 
 #include "stdafx.h"
-#include "sound.h"
+#include "sword1/sound.h"
 #include "common/util.h"
-#include "resman.h"
-#include "logic.h"
-#include "sword1.h"
+#include "sword1/resman.h"
+#include "sword1/logic.h"
+#include "sword1/sword1.h"
 
 namespace Sword1 {
 

sword1/sword1.cpp

@@ -29,17 +29,17 @@
 #include "common/file.h"
 #include "common/timer.h"
 
-#include "memman.h"
-#include "resman.h"
-#include "objectman.h"
-#include "mouse.h"
-#include "logic.h"
-#include "sound.h"
-#include "screen.h"
-#include "swordres.h"
-#include "menu.h"
-#include "music.h"
-#include "control.h"
+#include "sword1/memman.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
+#include "sword1/mouse.h"
+#include "sword1/logic.h"
+#include "sword1/sound.h"
+#include "sword1/screen.h"
+#include "sword1/swordres.h"
+#include "sword1/menu.h"
+#include "sword1/music.h"
+#include "sword1/control.h"
 
 #include "gui/message.h"
 #include "gui/newgui.h"

sword1/sword1.h

@@ -25,7 +25,7 @@
 #include "base/engine.h"
 #include "common/util.h"
 #include "base/gameDetector.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {
 

sword1/text.cpp

@@ -20,12 +20,12 @@
  */
 
 #include "stdafx.h"
-#include "text.h"
-#include "resman.h"
-#include "objectman.h"
+#include "sword1/text.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
 #include "common/util.h"
-#include "swordres.h"
-#include "sworddefs.h"
+#include "sword1/swordres.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {
 

sword1/text.h

@@ -22,8 +22,8 @@
 #ifndef BSTEXT_H
 #define BSTEXT_H
 
-#include "object.h"
-#include "sworddefs.h"
+#include "sword1/object.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {