[Scummvm-cvs-logs] CVS: scummvm/backends/dc Makefile,1.1.1.1,1.2 audio.cpp,1.1.1.1,1.2 dcmain.cpp,1.1.1.1,1.2 display.cpp,1.2,1.3 input.cpp,1.1.1.1,1.2 selector.cpp,1.2,1.3 vmsave.cpp,1.2,1.3

[Marcus Comstedt]

Update of /cvsroot/scummvm/scummvm/backends/dc
In directory usw-pr-cvs1:/tmp/cvs-serv26847

Modified Files:
	Makefile audio.cpp dcmain.cpp display.cpp input.cpp 
	selector.cpp vmsave.cpp 
Log Message:
Updated for new directory layout.

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile	21 Aug 2002 16:07:09 -0000	1.1.1.1
+++ Makefile	13 Sep 2002 14:27:03 -0000	1.2
@@ -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) $@
+
 

Index: audio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/audio.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- audio.cpp	21 Aug 2002 16:07:09 -0000	1.1.1.1
+++ audio.cpp	13 Sep 2002 14:27:03 -0000	1.2
@@ -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);

Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dcmain.cpp	21 Aug 2002 16:07:09 -0000	1.1.1.1
+++ dcmain.cpp	13 Sep 2002 14:27:03 -0000	1.2
@@ -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"
 

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/display.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- display.cpp	9 Sep 2002 05:56:10 -0000	1.2
+++ display.cpp	13 Sep 2002 14:27:03 -0000	1.3
@@ -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

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/input.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- input.cpp	21 Aug 2002 16:07:09 -0000	1.1.1.1
+++ input.cpp	13 Sep 2002 14:27:03 -0000	1.2
@@ -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,

Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/selector.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- selector.cpp	31 Aug 2002 13:29:08 -0000	1.2
+++ selector.cpp	13 Sep 2002 14:27:03 -0000	1.3
@@ -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 @@
 {
   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);

Index: vmsave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/vmsave.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vmsave.cpp	31 Aug 2002 13:29:08 -0000	1.2
+++ vmsave.cpp	13 Sep 2002 14:27:03 -0000	1.3
@@ -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>