Finally got rid of the "driver" directory. It made sense in the original code,

because that's where the Windows-specific stuff was, but in ScummVM we let the
backend handle the platform-specific stuff.

Next step will be to rename and restructure some of the files. I'll need to
look a bit more at the BASS and BS1 code bases first, to see if I can get any
sensible ideas from there.

svn-id: r20445

sword2/animation.cpp

@@ -31,7 +31,7 @@
 #include "sword2/maketext.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"
-#include "sword2/driver/animation.h"
+#include "sword2/animation.h"
 
 namespace Sword2 {
 

sword2/anims.cpp

@@ -37,7 +37,7 @@
 #include "sword2/resman.h"
 #include "sword2/router.h"
 #include "sword2/sound.h"
-#include "sword2/driver/animation.h"
+#include "sword2/animation.h"
 
 namespace Sword2 {
 

sword2/function.cpp

@@ -34,7 +34,7 @@
 #include "sword2/resman.h"
 #include "sword2/router.h"
 #include "sword2/sound.h"
-#include "sword2/driver/animation.h"
+#include "sword2/animation.h"
 
 namespace Sword2 {
 

sword2/module.mk

@@ -1,10 +1,13 @@
 MODULE := sword2
 
 MODULE_OBJS := \
+	sword2/_mouse.o \
+	sword2/animation.o \
 	sword2/anims.o \
 	sword2/build_display.o \
 	sword2/console.o \
 	sword2/controls.o \
+	sword2/d_draw.o \
 	sword2/debug.o \
 	sword2/events.o \
 	sword2/function.o \
@@ -14,31 +17,27 @@ MODULE_OBJS := \
 	sword2/logic.o \
 	sword2/maketext.o \
 	sword2/memory.o \
+	sword2/menu.o \
 	sword2/mouse.o \
+	sword2/music.o \
+	sword2/palette.o \
 	sword2/protocol.o \
+	sword2/rdwin.o \
+	sword2/render.o \
 	sword2/resman.o \
 	sword2/router.o \
 	sword2/save_rest.o \
 	sword2/scroll.o \
 	sword2/sound.o \
 	sword2/speech.o \
+	sword2/sprite.o \
 	sword2/startup.o \
 	sword2/sword2.o \
 	sword2/sync.o \
-	sword2/walker.o \
-	sword2/driver/d_draw.o \
-	sword2/driver/d_sound.o \
-	sword2/driver/menu.o \
-	sword2/driver/_mouse.o \
-	sword2/driver/palette.o \
-	sword2/driver/rdwin.o \
-	sword2/driver/render.o \
-	sword2/driver/sprite.o \
-	sword2/driver/animation.o
+	sword2/walker.o
 
 MODULE_DIRS += \
-	sword2 \
-	sword2/driver
+	sword2
 
 # This module can be built as a plugin
 ifdef BUILD_PLUGINS

sword2/render.cpp

@@ -29,7 +29,7 @@
 #include "sword2/build_display.h"
 
 #ifdef BACKEND_8BIT
-#include "sword2/driver/animation.h"
+#include "sword2/animation.h"
 #endif
 
 namespace Sword2 {