aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2009-02-15 20:15:24 +0000
committerPaweł Kołodziejski2009-02-15 20:15:24 +0000
commit78282ea586a4cfbf16b57782c4905d751911e210 (patch)
treeb011ca4bd2b38ab4f858d93dc472b03ebb8c9cd4
parent7d0d96ecc1ff743bdb9828e1da52d20d67eabc72 (diff)
downloadscummvm-rg350-78282ea586a4cfbf16b57782c4905d751911e210.tar.gz
scummvm-rg350-78282ea586a4cfbf16b57782c4905d751911e210.tar.bz2
scummvm-rg350-78282ea586a4cfbf16b57782c4905d751911e210.zip
remove defines from msvc project files
svn-id: r38286
-rw-r--r--dists/msvc9/sci.vcproj4
-rw-r--r--engines/sci/include/resource.h11
2 files changed, 6 insertions, 9 deletions
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 1407558547..ebd3ecc922 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -44,7 +44,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -120,7 +120,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h
index cb6bc537ff..26a8318b76 100644
--- a/engines/sci/include/resource.h
+++ b/engines/sci/include/resource.h
@@ -59,12 +59,12 @@
#ifdef SCUMMVM
//TODO: Remove these defines by replacing their functionality by their ScummVM counterparts
-#ifndef _MSC_VER
-#define HAVE_UNISTD_H
-#define HAVE_FCNTL_H
+#define HAVE_MEMCHR
#define HAVE_UNLINK
#define HAVE_RMDIR
-#define HAVE_MEMCHR
+#define HAVE_FCNTL_H
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H
#define HAVE_SYS_TIME_H
#define HAVE_GETTIMEOFDAY
#endif
@@ -107,9 +107,6 @@
#endif
#ifdef _MSC_VER
-//# include <sys/timeb.h>
-# include <fcntl.h>
-# include <windows.h>
# undef strcasecmp
# undef strncasecmp
# define strcasecmp _stricmp