aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-09-04 14:53:14 +0000
committerPaweł Kołodziejski2004-09-04 14:53:14 +0000
commit0901b17828fa5f74e622d0079f3c4501e846aaa8 (patch)
tree748123d2f1a5964e8ee3fc96397ce963e625b60b
parent9032d086afde50abdcba39e2fc557d8c4058ee20 (diff)
downloadscummvm-rg350-0901b17828fa5f74e622d0079f3c4501e846aaa8.tar.gz
scummvm-rg350-0901b17828fa5f74e622d0079f3c4501e846aaa8.tar.bz2
scummvm-rg350-0901b17828fa5f74e622d0079f3c4501e846aaa8.zip
fixed warning, updated msvc projects
svn-id: r14894
-rw-r--r--common/debugger.cpp2
-rw-r--r--dists/msvc7/scumm.vcproj3
-rw-r--r--dists/msvc7/scummvm.vcproj21
-rw-r--r--dists/msvc7/sword2.vcproj3
4 files changed, 25 insertions, 4 deletions
diff --git a/common/debugger.cpp b/common/debugger.cpp
index 47fb6e2a3d..900fb03b87 100644
--- a/common/debugger.cpp
+++ b/common/debugger.cpp
@@ -227,7 +227,7 @@ bool Debugger<T>::RunCommand(const char *inputOrig) {
break;
// Integer array
case DVAR_INTARRAY: {
- char *chr = strchr(param[0], '[');
+ char *chr = (char *)strchr(param[0], '[');
if (!chr) {
DebugPrintf("You must access this array as %s[element]\n", param[0]);
} else {
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index 89871d488c..4603b3cd57 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -409,6 +409,9 @@
RelativePath="..\..\scumm\script_v7he.cpp">
</File>
<File
+ RelativePath="..\..\scumm\script_v72he.cpp">
+ </File>
+ <File
RelativePath="..\..\scumm\script_v8.cpp">
</File>
<File
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index cf9fb92f40..360bc33a54 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -300,6 +300,24 @@
<File
RelativePath="..\..\common\scaler\intern.h">
</File>
+ <File
+ RelativePath="..\..\common\scaler\scale2x.cpp">
+ </File>
+ <File
+ RelativePath="..\..\common\scaler\scale2x.h">
+ </File>
+ <File
+ RelativePath="..\..\common\scaler\scale3x.cpp">
+ </File>
+ <File
+ RelativePath="..\..\common\scaler\scale3x.h">
+ </File>
+ <File
+ RelativePath="..\..\common\scaler\scalebit.cpp">
+ </File>
+ <File
+ RelativePath="..\..\common\scaler\scalebit.h">
+ </File>
</Filter>
</Filter>
<Filter
@@ -508,6 +526,9 @@
RelativePath="..\..\gui\console.cpp">
</File>
<File
+ RelativePath="..\..\gui\consolefont.cpp">
+ </File>
+ <File
RelativePath="..\..\gui\console.h">
</File>
<File
diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj
index 185df473c3..1a2ed02021 100644
--- a/dists/msvc7/sword2.vcproj
+++ b/dists/msvc7/sword2.vcproj
@@ -125,9 +125,6 @@
RelativePath="..\..\sword2\driver\driver96.h">
</File>
<File
- RelativePath="..\..\sword2\driver\keyboard.cpp">
- </File>
- <File
RelativePath="..\..\sword2\driver\menu.cpp">
</File>
<File