Updated for new directory layout.

svn-id: r4931

7 files changed, 35 insertions, 37 deletions

diff --git a/backends/dc/Makefile b/backends/dc/Makefile
index 18ba20d6fc..a53f440b42 100644
--- a/backends/dc/Makefile
+++ b/backends/dc/Makefile
@@ -2,38 +2,33 @@
 
 ronindir = /usr/local/ronin
 
-VPATH = ..
+VPATH = ../..
 
-CC      = sh-elf-g++ -ml -m4-single-only
+CXX     = sh-elf-g++ -ml -m4-single-only
 CFLAGS  = -O1 -Wno-multichar
 DEFINES = -D__DC__ -DNONSTANDARD_PORT -DNONSTANDARD_SAVE
 LDFLAGS := -Wl,-Ttext,0x8c010000 -nostartfiles ronin/crt0.o
-INCLUDES:= -I./ -I../ -I../sound
+INCLUDES:= -I./ -I../.. -I../../common
 CPPFLAGS= $(DEFINES) $(INCLUDES)
 LIBS	= ronin/libronin.a ronin/libz.a -lm
 EXEEXT =
+MKDIR = mkdir -p
+ECHO = /usr/ucb/echo -n
+CAT = cat
+RM = rm -f
+AR = sh-elf-ar cru
+RANLIB = sh-elf-ranlib
 
 OBJS =	dcmain.o display.o audio.o input.o selector.o icon.o \
 	label.o vmsave.o
 
-include ../Makefile.common
+include ../../Makefile.common
 
 INCS	+= portdefs.h dc.h
 
-$(OBJS): Makefile sound/.create simon/.create v3/.create v4/.create ronin
-
-sound/.create:
-	mkdir sound && touch $@
-
-simon/.create:
-	mkdir simon && touch $@
-
-v3/.create:
-	mkdir v3 && touch $@
-
-v4/.create:
-	mkdir v4 && touch $@
+$(OBJS): Makefile ronin
 
 ronin:
 	ln -s $(ronindir) $@
 
+
diff --git a/backends/dc/audio.cpp b/backends/dc/audio.cpp
index 863c1e97ac..64181480cb 100644
--- a/backends/dc/audio.cpp
+++ b/backends/dc/audio.cpp
@@ -20,8 +20,9 @@
  *
  */
 
-#include "stdafx.h"
-#include "scumm.h"
+#include <common/scummsys.h>
+#include <common/stdafx.h>
+#include <common/engine.h>
 #include "dc.h"
 
 EXTERN_C void *memcpy4(void *s1, const void *s2, unsigned int n);
diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp
index a64643a004..85bc247581 100644
--- a/backends/dc/dcmain.cpp
+++ b/backends/dc/dcmain.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "stdafx.h"
-#include "scumm.h"
-#include "mididrv.h"
-#include "gameDetector.h"
+#include <common/scummsys.h>
+#include <common/stdafx.h>
+#include <common/engine.h>
+#include <common/gameDetector.h>
 #include "dc.h"
 #include "icon.h"
 
diff --git a/backends/dc/display.cpp b/backends/dc/display.cpp
index 317f33a0fa..9d3e7719c5 100644
--- a/backends/dc/display.cpp
+++ b/backends/dc/display.cpp
@@ -20,8 +20,9 @@
  *
  */
 
-#include "stdafx.h"
-#include "scumm.h"
+#include <common/scummsys.h>
+#include <common/stdafx.h>
+#include <common/engine.h>
 #include "dc.h"
 
 #define SCREEN_W 320
diff --git a/backends/dc/input.cpp b/backends/dc/input.cpp
index ed7289e463..f31a7ffc8e 100644
--- a/backends/dc/input.cpp
+++ b/backends/dc/input.cpp
@@ -20,8 +20,9 @@
  *
  */
 
-#include "stdafx.h"
-#include "scumm.h"
+#include <common/scummsys.h>
+#include <common/stdafx.h>
+#include <common/engine.h>
 #include "dc.h"
 
 int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
diff --git a/backends/dc/selector.cpp b/backends/dc/selector.cpp
index 0d643dd812..c75bb8ee2b 100644
--- a/backends/dc/selector.cpp
+++ b/backends/dc/selector.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "stdafx.h"
-#include "scumm.h"
-#include "mididrv.h"
-#include "gameDetector.h"
+#include <common/scummsys.h>
+#include <common/stdafx.h>
+#include <common/engine.h>
+#include <common/gameDetector.h>
 #include "dc.h"
 #include "icon.h"
 #include "label.h"
@@ -165,7 +165,7 @@ static void checkName(GameDetector *d, Game &game)
 {
   d->_exe_name = game.filename_base;
   if(d->detectGame()) {
-    char *n = d->getGameName();
+    const char *n = d->getGameName();
     strcpy(game.text, n);
   } else
     strcpy(game.text, game.filename_base);
diff --git a/backends/dc/vmsave.cpp b/backends/dc/vmsave.cpp
index ef3999ddb9..af43479128 100644
--- a/backends/dc/vmsave.cpp
+++ b/backends/dc/vmsave.cpp
@@ -20,13 +20,13 @@
  *
  */
 
-#include "stdafx.h"
-#include "scumm.h"
-#include "mididrv.h"
-#include "gameDetector.h"
+#include <common/scummsys.h>
+#include <common/stdafx.h>
+#include <common/engine.h>
+#include <common/gameDetector.h>
 #include "dc.h"
 #include "icon.h"
-#include "saveload.h"
+#include <scumm/saveload.h>
 
 #include <ronin/zlib.h>