aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-03-25 08:46:24 +0000
committerPaweł Kołodziejski2002-03-25 08:46:24 +0000
commitef7ed538874f86325d13bb542937e9dd1f4cc622 (patch)
tree99818d458937cacb201573f4adbc35b412999f13
parent516ad6a28f465668e5b00ece5cb765554698b07d (diff)
downloadscummvm-rg350-ef7ed538874f86325d13bb542937e9dd1f4cc622.tar.gz
scummvm-rg350-ef7ed538874f86325d13bb542937e9dd1f4cc622.tar.bz2
scummvm-rg350-ef7ed538874f86325d13bb542937e9dd1f4cc622.zip
Visual C++ compilation fixes, and renaming gameDetector
svn-id: r3822
-rw-r--r--gameDetector.cpp (renamed from gameDetecter.cpp)2
-rw-r--r--gameDetector.h (renamed from gameDetecter.h)0
-rw-r--r--scummvm.dsp20
-rw-r--r--sdl.cpp2
-rw-r--r--v3/resource_v3.cpp (renamed from v3/resource.cpp)4
-rw-r--r--v4/resource_v4.cpp (renamed from v4/resource.cpp)4
6 files changed, 24 insertions, 8 deletions
diff --git a/gameDetecter.cpp b/gameDetector.cpp
index 4af61ae82c..914ba0f937 100644
--- a/gameDetecter.cpp
+++ b/gameDetector.cpp
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "scumm.h"
-#include "gameDetecter.h"
+#include "gameDetector.h"
#define USAGE_STRING "ScummVM - Scumm Interpreter\n" \
diff --git a/gameDetecter.h b/gameDetector.h
index 613ae4c371..613ae4c371 100644
--- a/gameDetecter.h
+++ b/gameDetector.h
diff --git a/scummvm.dsp b/scummvm.dsp
index 4a6ce777fb..e448985007 100644
--- a/scummvm.dsp
+++ b/scummvm.dsp
@@ -135,6 +135,22 @@ SOURCE=.\sound\gmidi.cpp
SOURCE=.\sound\imuse.cpp
# End Source File
# End Group
+# Begin Group "v4"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\v4\resource_v4.cpp
+# End Source File
+# End Group
+# Begin Group "v3"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\v3\resource_v3.cpp
+# End Source File
+# End Group
# Begin Source File
SOURCE=.\actor.cpp
@@ -190,7 +206,7 @@ SOURCE=.\debug.cpp
# End Source File
# Begin Source File
-SOURCE=.\gameDetecter.cpp
+SOURCE=.\gameDetector.cpp
# End Source File
# Begin Source File
@@ -422,7 +438,7 @@ SOURCE=.\sound\fmopl.h
# End Source File
# Begin Source File
-SOURCE=.\gameDetecter.h
+SOURCE=.\gameDetector.h
# End Source File
# Begin Source File
diff --git a/sdl.cpp b/sdl.cpp
index 5f8c1eae0f..5f764075ec 100644
--- a/sdl.cpp
+++ b/sdl.cpp
@@ -26,7 +26,7 @@
#include "scumm.h"
#include "gui.h"
#include "SDL_thread.h"
-#include "gameDetecter.h"
+#include "gameDetector.h"
#include "cdmusic.h"
diff --git a/v3/resource.cpp b/v3/resource_v3.cpp
index e6836876b9..ebda7cf836 100644
--- a/v3/resource.cpp
+++ b/v3/resource_v3.cpp
@@ -1,5 +1,5 @@
-#include"../stdafx.h"
-#include"../scumm.h"
+#include "stdafx.h"
+#include "scumm.h"
void Scumm_v3::readIndexFile() {
diff --git a/v4/resource.cpp b/v4/resource_v4.cpp
index 3cf2d4ec00..20b1adc3a2 100644
--- a/v4/resource.cpp
+++ b/v4/resource_v4.cpp
@@ -1,5 +1,5 @@
-#include"../stdafx.h"
-#include"../scumm.h"
+#include "stdafx.h"
+#include "scumm.h"
void Scumm_v4::loadCharset(int no) {
uint32 size;